From fb00936fc11f4ce5ab96bd26445624135f182df3 Mon Sep 17 00:00:00 2001 From: Electro_593 Date: Sun, 2 Mar 2025 12:09:47 -0500 Subject: [PATCH] Fix datagen for merge --- .../spectrum/blockstates/block_detector.json | 94 +++++++++---------- .../spectrum/models/item/pure_azurite.json | 6 ++ .../spectrum/models/item/pure_bloodstone.json | 6 ++ .../spectrum/models/item/pure_malachite.json | 6 ++ .../DropSelfResonanceProcessor.java | 2 +- .../spectrum/registries/SpectrumBlocks.java | 4 +- .../registries/client/SpectrumModels.java | 6 +- 7 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 src/main/generated/assets/spectrum/models/item/pure_azurite.json create mode 100644 src/main/generated/assets/spectrum/models/item/pure_bloodstone.json create mode 100644 src/main/generated/assets/spectrum/models/item/pure_malachite.json diff --git a/src/main/generated/assets/spectrum/blockstates/block_detector.json b/src/main/generated/assets/spectrum/blockstates/block_detector.json index ae02876afa..1633a7db58 100644 --- a/src/main/generated/assets/spectrum/blockstates/block_detector.json +++ b/src/main/generated/assets/spectrum/blockstates/block_detector.json @@ -5,103 +5,103 @@ "x": 90, "y": 90 }, + "orientation=down_east,triggered=true": { + "model": "spectrum:block/block_detector_active", + "x": 90, + "y": 90 + }, "orientation=down_north,triggered=false": { "model": "spectrum:block/block_detector", "x": 90 }, + "orientation=down_north,triggered=true": { + "model": "spectrum:block/block_detector_active", + "x": 90 + }, "orientation=down_south,triggered=false": { "model": "spectrum:block/block_detector", "x": 90, "y": 180 }, - "orientation=down_west,triggered=false": { - "model": "spectrum:block/block_detector", + "orientation=down_south,triggered=true": { + "model": "spectrum:block/block_detector_active", "x": 90, - "y": 270 - }, - "orientation=east_up,triggered=false": { - "model": "spectrum:block/block_detector", - "y": 90 - }, - "orientation=north_up,triggered=false": { - "model": "spectrum:block/block_detector" - }, - "orientation=south_up,triggered=false": { - "model": "spectrum:block/block_detector", "y": 180 }, - "orientation=up_east,triggered=false": { - "model": "spectrum:block/block_detector", - "x": 270, - "y": 270 - }, - "orientation=up_north,triggered=false": { - "model": "spectrum:block/block_detector", - "x": 270, - "y": 180 - }, - "orientation=up_south,triggered=false": { - "model": "spectrum:block/block_detector", - "x": 270 - }, - "orientation=up_west,triggered=false": { - "model": "spectrum:block/block_detector", - "x": 270, - "y": 90 - }, - "orientation=west_up,triggered=false": { + "orientation=down_west,triggered=false": { "model": "spectrum:block/block_detector", - "y": 270 - }, - "orientation=down_east,triggered=true": { - "model": "spectrum:block/block_detector_active", - "x": 90, - "y": 90 - }, - "orientation=down_north,triggered=true": { - "model": "spectrum:block/block_detector_active", - "x": 90 - }, - "orientation=down_south,triggered=true": { - "model": "spectrum:block/block_detector_active", "x": 90, - "y": 180 + "y": 270 }, "orientation=down_west,triggered=true": { "model": "spectrum:block/block_detector_active", "x": 90, "y": 270 }, + "orientation=east_up,triggered=false": { + "model": "spectrum:block/block_detector", + "y": 90 + }, "orientation=east_up,triggered=true": { "model": "spectrum:block/block_detector_active", "y": 90 }, + "orientation=north_up,triggered=false": { + "model": "spectrum:block/block_detector" + }, "orientation=north_up,triggered=true": { "model": "spectrum:block/block_detector_active" }, + "orientation=south_up,triggered=false": { + "model": "spectrum:block/block_detector", + "y": 180 + }, "orientation=south_up,triggered=true": { "model": "spectrum:block/block_detector_active", "y": 180 }, + "orientation=up_east,triggered=false": { + "model": "spectrum:block/block_detector", + "x": 270, + "y": 270 + }, "orientation=up_east,triggered=true": { "model": "spectrum:block/block_detector_active", "x": 270, "y": 270 }, + "orientation=up_north,triggered=false": { + "model": "spectrum:block/block_detector", + "x": 270, + "y": 180 + }, "orientation=up_north,triggered=true": { "model": "spectrum:block/block_detector_active", "x": 270, "y": 180 }, + "orientation=up_south,triggered=false": { + "model": "spectrum:block/block_detector", + "x": 270 + }, "orientation=up_south,triggered=true": { "model": "spectrum:block/block_detector_active", "x": 270 }, + "orientation=up_west,triggered=false": { + "model": "spectrum:block/block_detector", + "x": 270, + "y": 90 + }, "orientation=up_west,triggered=true": { "model": "spectrum:block/block_detector_active", "x": 270, "y": 90 }, + "orientation=west_up,triggered=false": { + "model": "spectrum:block/block_detector", + "y": 270 + }, "orientation=west_up,triggered=true": { "model": "spectrum:block/block_detector_active", "y": 270 diff --git a/src/main/generated/assets/spectrum/models/item/pure_azurite.json b/src/main/generated/assets/spectrum/models/item/pure_azurite.json new file mode 100644 index 0000000000..92d5c0201a --- /dev/null +++ b/src/main/generated/assets/spectrum/models/item/pure_azurite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "spectrum:item/pure_azurite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/spectrum/models/item/pure_bloodstone.json b/src/main/generated/assets/spectrum/models/item/pure_bloodstone.json new file mode 100644 index 0000000000..a0724052a5 --- /dev/null +++ b/src/main/generated/assets/spectrum/models/item/pure_bloodstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "spectrum:item/pure_bloodstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/spectrum/models/item/pure_malachite.json b/src/main/generated/assets/spectrum/models/item/pure_malachite.json new file mode 100644 index 0000000000..2af6c36a5a --- /dev/null +++ b/src/main/generated/assets/spectrum/models/item/pure_malachite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "spectrum:item/pure_malachite" + } +} \ No newline at end of file diff --git a/src/main/java/de/dafuqs/spectrum/data_loaders/resonance_processors/DropSelfResonanceProcessor.java b/src/main/java/de/dafuqs/spectrum/data_loaders/resonance_processors/DropSelfResonanceProcessor.java index 66813468ec..cb1c17eb7d 100644 --- a/src/main/java/de/dafuqs/spectrum/data_loaders/resonance_processors/DropSelfResonanceProcessor.java +++ b/src/main/java/de/dafuqs/spectrum/data_loaders/resonance_processors/DropSelfResonanceProcessor.java @@ -127,7 +127,7 @@ public Builder includeDefaultState() { } public DropSelfResonanceProcessor build() { - return new DropSelfResonanceProcessor(blockTarget, nbtToCopy, statePropertiesToCopy, includeDefaultStateProperties); + return new DropSelfResonanceProcessor(blockTarget, statePropertiesToCopy, nbtToCopy, includeDefaultStateProperties); } } diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index 4694da8928..f10cbd76e1 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -1627,8 +1627,8 @@ public static ColoredSporeBlossomBlock registerColoredSporeBlossomBlock(String n public static ShimmerstoneLightBlock registerShimmerstoneLight(String name, BlockSoundGroup soundGroup, Supplier outerSupplier) { return register(blockWithItem(name, new ShimmerstoneLightBlock(settings(MapColor.CLEAR, soundGroup, 1.0F).nonOpaque().requiresTool().luminance(state -> 15).pistonBehavior(PistonBehavior.DESTROY)), InkColors.YELLOW).withBlockModel((ctx, block) -> { Identifier outer = outerSupplier.get(); - Identifier base = SpectrumModels.BASE_FLAT_LIGHT.upload(block, SpectrumTextureMaps.innerOuterParticle(SpectrumTextures.SHIMMERSTONE_LIGHT, outer, outer), ctx.modelCollector); - Identifier mirrored = SpectrumModels.BASE_FLAT_LIGHT_MIRRORED.upload(block, "_mirrored", SpectrumTextureMaps.innerOuterParticle(SpectrumTextures.SHIMMERSTONE_LIGHT, outer, outer), ctx.modelCollector); + Identifier base = SpectrumModels.SHIMMERSTONE_LIGHT.upload(block, SpectrumTextureMaps.innerOuterParticle(SpectrumTextures.SHIMMERSTONE_LIGHT, outer, outer), ctx.modelCollector); + Identifier mirrored = SpectrumModels.SHIMMERSTONE_LIGHT_MIRRORED.upload(block, "_mirrored", SpectrumTextureMaps.innerOuterParticle(SpectrumTextures.SHIMMERSTONE_LIGHT, outer, outer), ctx.modelCollector); return VariantsBlockStateSupplier.create(block).coordinate(createNorthDefaultFacingVariantMap()).coordinate(createBooleanModelMap(Properties.INVERTED, mirrored, base)); })); } diff --git a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModels.java b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModels.java index 93f0788d76..2df29aba6b 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModels.java +++ b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumModels.java @@ -11,6 +11,7 @@ import static net.minecraft.data.client.TextureKey.*; public class SpectrumModels { + // Item Templates public static final Model CLUSTER_ITEM = new Model(Optional.of(SpectrumCommon.locate("templates_item/cluster")), Optional.empty(), LAYER0); public static final Model LARGE_BUD_ITEM = new Model(Optional.of(SpectrumCommon.locate("templates_item/large_bud")), Optional.empty(), LAYER0); @@ -18,12 +19,11 @@ public class SpectrumModels { public static final Model SMALL_BUD_ITEM = new Model(Optional.of(SpectrumCommon.locate("templates_item/small_bud")), Optional.empty(), LAYER0); // Vanilla Items - public static final Identifier SKULL_ITEM = Identifier.ofVanilla("item/template_skull"); // Block Templates - public static final Model BASE_FLAT_LIGHT = new Model(Optional.of(SpectrumCommon.locate("templates/base_flat_light")), Optional.empty(), INNER, OUTER, PARTICLE); - public static final Model BASE_FLAT_LIGHT_MIRRORED = new Model(Optional.of(SpectrumCommon.locate("templates/base_flat_light_mirrored")), Optional.empty(), INNER, OUTER, PARTICLE); + public static final Model SHIMMERSTONE_LIGHT = new Model(Optional.of(SpectrumCommon.locate("templates/shimmerstone_light")), Optional.empty(), INNER, OUTER, PARTICLE); + public static final Model SHIMMERSTONE_LIGHT_MIRRORED = new Model(Optional.of(SpectrumCommon.locate("templates/shimmerstone_light_mirrored")), Optional.empty(), INNER, OUTER, PARTICLE); public static final Model BASE_PYLON_BODY = new Model(Optional.of(SpectrumCommon.locate("templates/base_pylon_body")), Optional.empty(), SIDE, END); public static final Model BASE_TRANS_LIGHT_CORE = new Model(Optional.of(SpectrumCommon.locate("templates/base_trans_light_core")), Optional.empty(), GLASS, CASE, BASE, ENDS, SHELL, FILAMENT); public static final Model BOWL = new Model(Optional.of(SpectrumCommon.locate("templates/base_bowl")), Optional.empty(), SIDE, TOP, BOTTOM, INNER);