diff --git a/gradle.properties b/gradle.properties index 2473b14..5c89330 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,19 +5,19 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://modrinth.com/mod/fabric-api/versions -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 loader_version=0.16.7 # Fabric API -fabric_version=0.105.0+1.21.1 +fabric_version=0.106.1+1.21.3 # Mod Properties -mod_version = 1.10-MC1.21.1 +mod_version = 1.10-MC1.21.3 maven_group = net.wurstclient.glass archives_base_name = Mo-Glass # CurseForge -cf_game_version=1.21.1 +cf_game_version=1.21.3 # Dependencies diff --git a/src/main/java/net/wurstclient/glass/GlassSlabBlock.java b/src/main/java/net/wurstclient/glass/GlassSlabBlock.java index a5ec7db..4a8c310 100644 --- a/src/main/java/net/wurstclient/glass/GlassSlabBlock.java +++ b/src/main/java/net/wurstclient/glass/GlassSlabBlock.java @@ -128,8 +128,7 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return true; } diff --git a/src/main/java/net/wurstclient/glass/GlassStairsBlock.java b/src/main/java/net/wurstclient/glass/GlassStairsBlock.java index d0752e7..760570f 100644 --- a/src/main/java/net/wurstclient/glass/GlassStairsBlock.java +++ b/src/main/java/net/wurstclient/glass/GlassStairsBlock.java @@ -321,8 +321,7 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return true; } diff --git a/src/main/java/net/wurstclient/glass/MoGlassBlocks.java b/src/main/java/net/wurstclient/glass/MoGlassBlocks.java index b1e92c1..37f63f4 100644 --- a/src/main/java/net/wurstclient/glass/MoGlassBlocks.java +++ b/src/main/java/net/wurstclient/glass/MoGlassBlocks.java @@ -42,14 +42,18 @@ public enum MoGlassBlocks .allowsSpawning(Blocks::never).solidBlock(Blocks::never) .suffocates(Blocks::never).blockVision(Blocks::never)); - public static final Block TINTED_GLASS_SLAB = new TintedGlassSlabBlock( - AbstractBlock.Settings.copy(Blocks.GLASS).mapColor(MapColor.GRAY) - .nonOpaque().allowsSpawning(Blocks::never).solidBlock(Blocks::never) + public static final Block TINTED_GLASS_SLAB = + new TintedGlassSlabBlock(AbstractBlock.Settings.create() + .instrument(NoteBlockInstrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).mapColor(MapColor.GRAY) + .allowsSpawning(Blocks::never).solidBlock(Blocks::never) .suffocates(Blocks::never).blockVision(Blocks::never)); - public static final Block TINTED_GLASS_STAIRS = new TintedGlassStairsBlock( - AbstractBlock.Settings.copy(Blocks.GLASS).mapColor(MapColor.GRAY) - .nonOpaque().allowsSpawning(Blocks::never).solidBlock(Blocks::never) + public static final Block TINTED_GLASS_STAIRS = + new TintedGlassStairsBlock(AbstractBlock.Settings.create() + .instrument(NoteBlockInstrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).mapColor(MapColor.GRAY) + .allowsSpawning(Blocks::never).solidBlock(Blocks::never) .suffocates(Blocks::never).blockVision(Blocks::never)); public static final StainedGlassSlabBlock WHITE_STAINED_GLASS_SLAB = diff --git a/src/main/java/net/wurstclient/glass/MoGlassTags.java b/src/main/java/net/wurstclient/glass/MoGlassTags.java index 9e9175f..a6d4082 100644 --- a/src/main/java/net/wurstclient/glass/MoGlassTags.java +++ b/src/main/java/net/wurstclient/glass/MoGlassTags.java @@ -11,38 +11,23 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import net.wurstclient.glass.mixin.ChunkLightProviderMixin; +import net.wurstclient.glass.mixin.BlockMixin; public enum MoGlassTags { ; /** - *

- * Blocks in this tag aren't opaque, but need to be considered opaque for - * lighting calculations. This is necessary for tinted glass slabs and - * stairs to properly block light. - * - *

- * Minecraft's lighting engine automatically calculates how smaller blocks - * like stairs and slabs will sometimes block light depending on how they - * are placed, but it only does this for blocks that are marked as opaque. - * Blocks made of glass, however, can't be opaque. - * - *

- * This is fine for vanilla tinted glass blocks, since full blocks can skip - * this calculation altogether and simply block all light in all directions. - * But for smaller tinted glass blocks like slabs and stairs, this needs to - * be fixed. + * Blocks in this tag need to be considered opaque for lighting + * calculations, but non-opaque for culling. This is necessary for tinted + * glass slabs and stairs to properly block light without letting you see + * through the world. * *

- * See {@link ChunkLightProviderMixin} for how I modified the default - * lighting engine to make this work. If your mod replaces the default - * lighting engine (hi jellysquid), you will likely need to make a similar - * change to make it compatible with Mo Glass's tinted glass blocks. + * See {@link BlockMixin} for how I modified culling to make this work. */ - public static final TagKey OPAQUE_FOR_LIGHTING = - createTag("opaque_for_lighting"); + public static final TagKey NON_OPAQUE_FOR_CULLING = + createTag("non_opaque_for_culling"); private static TagKey createTag(String idPath) { diff --git a/src/main/java/net/wurstclient/glass/StainedGlassSlabBlock.java b/src/main/java/net/wurstclient/glass/StainedGlassSlabBlock.java index 1654346..dc77949 100644 --- a/src/main/java/net/wurstclient/glass/StainedGlassSlabBlock.java +++ b/src/main/java/net/wurstclient/glass/StainedGlassSlabBlock.java @@ -138,8 +138,7 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return true; } diff --git a/src/main/java/net/wurstclient/glass/StainedGlassStairsBlock.java b/src/main/java/net/wurstclient/glass/StainedGlassStairsBlock.java index 4003e65..2bb5c95 100644 --- a/src/main/java/net/wurstclient/glass/StainedGlassStairsBlock.java +++ b/src/main/java/net/wurstclient/glass/StainedGlassStairsBlock.java @@ -326,8 +326,7 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return true; } diff --git a/src/main/java/net/wurstclient/glass/TintedGlassSlabBlock.java b/src/main/java/net/wurstclient/glass/TintedGlassSlabBlock.java index 5337db1..3dd826c 100644 --- a/src/main/java/net/wurstclient/glass/TintedGlassSlabBlock.java +++ b/src/main/java/net/wurstclient/glass/TintedGlassSlabBlock.java @@ -128,16 +128,14 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return false; } @Override - public int getOpacity(BlockState state, BlockView world, BlockPos pos) + public int getOpacity(BlockState state) { - return state.get(TYPE) == SlabType.DOUBLE ? world.getMaxLightLevel() - : 0; + return state.get(TYPE) == SlabType.DOUBLE ? 15 : 0; } } diff --git a/src/main/java/net/wurstclient/glass/TintedGlassStairsBlock.java b/src/main/java/net/wurstclient/glass/TintedGlassStairsBlock.java index 96c5b2e..7de6821 100644 --- a/src/main/java/net/wurstclient/glass/TintedGlassStairsBlock.java +++ b/src/main/java/net/wurstclient/glass/TintedGlassStairsBlock.java @@ -321,8 +321,7 @@ public float getAmbientOcclusionLightLevel(BlockState state, } @Override - public boolean isTransparent(BlockState state, BlockView world, - BlockPos pos) + public boolean isTransparent(BlockState state) { return false; } diff --git a/src/main/java/net/wurstclient/glass/mixin/BlockMixin.java b/src/main/java/net/wurstclient/glass/mixin/BlockMixin.java new file mode 100644 index 0000000..ff8642c --- /dev/null +++ b/src/main/java/net/wurstclient/glass/mixin/BlockMixin.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019-2024 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.glass.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.fabricmc.fabric.api.block.v1.FabricBlock; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemConvertible; +import net.minecraft.util.math.Direction; +import net.wurstclient.glass.MoGlass; +import net.wurstclient.glass.MoGlassTags; + +@Mixin(Block.class) +public abstract class BlockMixin extends AbstractBlock + implements ItemConvertible, FabricBlock +{ + private BlockMixin(MoGlass moGlass, Settings settings) + { + super(settings); + } + + /** + * See {@link MoGlassTags#NON_OPAQUE_FOR_CULLING} for why this exists. + */ + @Inject(at = @At("HEAD"), + method = "shouldDrawSide(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;)Z", + cancellable = true) + private static void onShouldDrawSide(BlockState state, + BlockState otherState, Direction direction, + CallbackInfoReturnable cir) + { + if(!state.isIn(ConventionalBlockTags.GLASS_BLOCKS_TINTED) + && !state.isIn(MoGlassTags.NON_OPAQUE_FOR_CULLING) + && otherState.isIn(MoGlassTags.NON_OPAQUE_FOR_CULLING)) + cir.setReturnValue(true); + } +} diff --git a/src/main/java/net/wurstclient/glass/mixin/ChunkLightProviderMixin.java b/src/main/java/net/wurstclient/glass/mixin/ChunkLightProviderMixin.java deleted file mode 100644 index 2dfd645..0000000 --- a/src/main/java/net/wurstclient/glass/mixin/ChunkLightProviderMixin.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2019-2024 Wurst-Imperium and contributors. - * - * This source code is subject to the terms of the GNU General Public - * License, version 3. If a copy of the GPL was not distributed with this - * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt - */ -package net.wurstclient.glass.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.block.BlockState; -import net.minecraft.world.chunk.light.ChunkLightProvider; -import net.wurstclient.glass.MoGlassTags; - -@Mixin(ChunkLightProvider.class) -public class ChunkLightProviderMixin -{ - /** - * See {@link MoGlassTags#OPAQUE_FOR_LIGHTING} for why this exists. - */ - @Redirect( - at = @At(value = "INVOKE", - target = "Lnet/minecraft/block/BlockState;isOpaque()Z", - ordinal = 0), - method = "isTrivialForLighting(Lnet/minecraft/block/BlockState;)Z") - private static boolean isOpaqueForLightingShape(BlockState blockState) - { - return blockState.isOpaque() - || blockState.isIn(MoGlassTags.OPAQUE_FOR_LIGHTING); - } -} diff --git a/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab.json index 43a1427..0783d1a 100644 --- a/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:black_stained_glass" - } + "#": "minecraft:black_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab_from_glass_stonecutting.json index cd4b276..1cdbee8 100644 --- a/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/black_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:black_stained_glass" - }, + "ingredient": "minecraft:black_stained_glass", "result": { "count": 2, "id": "mo_glass:black_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs.json index bc96049..b114b51 100644 --- a/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:black_stained_glass" - } + "#": "minecraft:black_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs_from_glass_stonecutting.json index ee11027..bb70ed7 100644 --- a/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/black_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:black_stained_glass" - }, + "ingredient": "minecraft:black_stained_glass", "result": { "count": 1, "id": "mo_glass:black_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab.json index 205ffc9..849a27f 100644 --- a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:blue_stained_glass" - } + "#": "minecraft:blue_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab_from_glass_stonecutting.json index b9135b8..1189260 100644 --- a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:blue_stained_glass" - }, + "ingredient": "minecraft:blue_stained_glass", "result": { "count": 2, "id": "mo_glass:blue_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs.json index f04a698..acaf6f2 100644 --- a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:blue_stained_glass" - } + "#": "minecraft:blue_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs_from_glass_stonecutting.json index f97cfe0..6e87593 100644 --- a/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/blue_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:blue_stained_glass" - }, + "ingredient": "minecraft:blue_stained_glass", "result": { "count": 1, "id": "mo_glass:blue_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab.json index 2eaad49..40a5bb7 100644 --- a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:brown_stained_glass" - } + "#": "minecraft:brown_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab_from_glass_stonecutting.json index 5489d44..f6d1ab6 100644 --- a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:brown_stained_glass" - }, + "ingredient": "minecraft:brown_stained_glass", "result": { "count": 2, "id": "mo_glass:brown_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs.json index f35bc00..c01d335 100644 --- a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:brown_stained_glass" - } + "#": "minecraft:brown_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs_from_glass_stonecutting.json index 8c0ba56..02614d6 100644 --- a/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/brown_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:brown_stained_glass" - }, + "ingredient": "minecraft:brown_stained_glass", "result": { "count": 1, "id": "mo_glass:brown_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab.json index d370433..8ff391e 100644 --- a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:cyan_stained_glass" - } + "#": "minecraft:cyan_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab_from_glass_stonecutting.json index 0582cc1..1370e8a 100644 --- a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:cyan_stained_glass" - }, + "ingredient": "minecraft:cyan_stained_glass", "result": { "count": 2, "id": "mo_glass:cyan_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs.json index e38a1e0..2dd9461 100644 --- a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:cyan_stained_glass" - } + "#": "minecraft:cyan_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs_from_glass_stonecutting.json index 2967f0a..337bfc7 100644 --- a/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/cyan_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:cyan_stained_glass" - }, + "ingredient": "minecraft:cyan_stained_glass", "result": { "count": 1, "id": "mo_glass:cyan_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/glass_slab.json b/src/main/resources/data/mo_glass/recipe/glass_slab.json index 0354987..8663591 100644 --- a/src/main/resources/data/mo_glass/recipe/glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/glass_slab.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "minecraft:glass" - } + "#": "minecraft:glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/glass_slab_from_glass_stonecutting.json index 2f894b1..cedec19 100644 --- a/src/main/resources/data/mo_glass/recipe/glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass" - }, + "ingredient": "minecraft:glass", "result": { "count": 2, "id": "mo_glass:glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/glass_stairs.json b/src/main/resources/data/mo_glass/recipe/glass_stairs.json index 19a5011..dffc4a0 100644 --- a/src/main/resources/data/mo_glass/recipe/glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/glass_stairs.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "minecraft:glass" - } + "#": "minecraft:glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/glass_stairs_from_glass_stonecutting.json index 96913e7..5fe34da 100644 --- a/src/main/resources/data/mo_glass/recipe/glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:glass" - }, + "ingredient": "minecraft:glass", "result": { "count": 1, "id": "mo_glass:glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab.json index a9f318b..c2562a4 100644 --- a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:gray_stained_glass" - } + "#": "minecraft:gray_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab_from_glass_stonecutting.json index 77b3cf3..6ce29ec 100644 --- a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:gray_stained_glass" - }, + "ingredient": "minecraft:gray_stained_glass", "result": { "count": 2, "id": "mo_glass:gray_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs.json index 041b91a..64aafa2 100644 --- a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:gray_stained_glass" - } + "#": "minecraft:gray_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs_from_glass_stonecutting.json index ff54a53..84478db 100644 --- a/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/gray_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:gray_stained_glass" - }, + "ingredient": "minecraft:gray_stained_glass", "result": { "count": 1, "id": "mo_glass:gray_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab.json index 03fe1be..19251c5 100644 --- a/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:green_stained_glass" - } + "#": "minecraft:green_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab_from_glass_stonecutting.json index 3ae8760..ab01202 100644 --- a/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/green_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:green_stained_glass" - }, + "ingredient": "minecraft:green_stained_glass", "result": { "count": 2, "id": "mo_glass:green_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs.json index 181d23d..0d997f6 100644 --- a/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:green_stained_glass" - } + "#": "minecraft:green_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs_from_glass_stonecutting.json index 4a83313..187e0a4 100644 --- a/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/green_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:green_stained_glass" - }, + "ingredient": "minecraft:green_stained_glass", "result": { "count": 1, "id": "mo_glass:green_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab.json index 9a352b9..34aa545 100644 --- a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:light_blue_stained_glass" - } + "#": "minecraft:light_blue_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab_from_glass_stonecutting.json index 425d021..ff9cc91 100644 --- a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:light_blue_stained_glass" - }, + "ingredient": "minecraft:light_blue_stained_glass", "result": { "count": 2, "id": "mo_glass:light_blue_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs.json index e20c699..6365728 100644 --- a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:light_blue_stained_glass" - } + "#": "minecraft:light_blue_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs_from_glass_stonecutting.json index 95aba6b..72906f0 100644 --- a/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/light_blue_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:light_blue_stained_glass" - }, + "ingredient": "minecraft:light_blue_stained_glass", "result": { "count": 1, "id": "mo_glass:light_blue_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab.json index 3345b2c..9a2f63a 100644 --- a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:light_gray_stained_glass" - } + "#": "minecraft:light_gray_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab_from_glass_stonecutting.json index 5922f12..7dde547 100644 --- a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:light_gray_stained_glass" - }, + "ingredient": "minecraft:light_gray_stained_glass", "result": { "count": 2, "id": "mo_glass:light_gray_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs.json index 10283dd..573d72b 100644 --- a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:light_gray_stained_glass" - } + "#": "minecraft:light_gray_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs_from_glass_stonecutting.json index 0c30bc8..4e1b8ba 100644 --- a/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/light_gray_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:light_gray_stained_glass" - }, + "ingredient": "minecraft:light_gray_stained_glass", "result": { "count": 1, "id": "mo_glass:light_gray_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab.json index fb9a71f..57c757c 100644 --- a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:lime_stained_glass" - } + "#": "minecraft:lime_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab_from_glass_stonecutting.json index 93d01c6..8074e53 100644 --- a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:lime_stained_glass" - }, + "ingredient": "minecraft:lime_stained_glass", "result": { "count": 2, "id": "mo_glass:lime_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs.json index 50db8c9..9d1ab78 100644 --- a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:lime_stained_glass" - } + "#": "minecraft:lime_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs_from_glass_stonecutting.json index 81c365f..747a500 100644 --- a/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/lime_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:lime_stained_glass" - }, + "ingredient": "minecraft:lime_stained_glass", "result": { "count": 1, "id": "mo_glass:lime_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab.json index 54e33b4..b3a5ad8 100644 --- a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:magenta_stained_glass" - } + "#": "minecraft:magenta_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab_from_glass_stonecutting.json index 40379b7..beceb42 100644 --- a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:magenta_stained_glass" - }, + "ingredient": "minecraft:magenta_stained_glass", "result": { "count": 2, "id": "mo_glass:magenta_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs.json index 9adf54c..a6e2a76 100644 --- a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:magenta_stained_glass" - } + "#": "minecraft:magenta_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs_from_glass_stonecutting.json index 0ffa3b9..7dfd8be 100644 --- a/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/magenta_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:magenta_stained_glass" - }, + "ingredient": "minecraft:magenta_stained_glass", "result": { "count": 1, "id": "mo_glass:magenta_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab.json index 36d056c..99fdf61 100644 --- a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:orange_stained_glass" - } + "#": "minecraft:orange_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab_from_glass_stonecutting.json index eeff775..9ad0bf2 100644 --- a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:orange_stained_glass" - }, + "ingredient": "minecraft:orange_stained_glass", "result": { "count": 2, "id": "mo_glass:orange_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs.json index 68a1351..8d2dc4b 100644 --- a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:orange_stained_glass" - } + "#": "minecraft:orange_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs_from_glass_stonecutting.json index fbf03d1..52d2ff6 100644 --- a/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/orange_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:orange_stained_glass" - }, + "ingredient": "minecraft:orange_stained_glass", "result": { "count": 1, "id": "mo_glass:orange_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab.json index c07f4bd..5998ab5 100644 --- a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:pink_stained_glass" - } + "#": "minecraft:pink_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab_from_glass_stonecutting.json index 4e16287..4aed9dc 100644 --- a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:pink_stained_glass" - }, + "ingredient": "minecraft:pink_stained_glass", "result": { "count": 2, "id": "mo_glass:pink_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs.json index 114451e..620fbdd 100644 --- a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:pink_stained_glass" - } + "#": "minecraft:pink_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs_from_glass_stonecutting.json index 9d706a0..abe75db 100644 --- a/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/pink_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:pink_stained_glass" - }, + "ingredient": "minecraft:pink_stained_glass", "result": { "count": 1, "id": "mo_glass:pink_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab.json index 89fc447..c8a9753 100644 --- a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:purple_stained_glass" - } + "#": "minecraft:purple_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab_from_glass_stonecutting.json index 01450ed..ae8dac1 100644 --- a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:purple_stained_glass" - }, + "ingredient": "minecraft:purple_stained_glass", "result": { "count": 2, "id": "mo_glass:purple_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs.json index f8df7a3..02ceadb 100644 --- a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:purple_stained_glass" - } + "#": "minecraft:purple_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs_from_glass_stonecutting.json index b26dad3..3b33854 100644 --- a/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/purple_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:purple_stained_glass" - }, + "ingredient": "minecraft:purple_stained_glass", "result": { "count": 1, "id": "mo_glass:purple_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab.json index 39ca391..c1023d5 100644 --- a/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:red_stained_glass" - } + "#": "minecraft:red_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab_from_glass_stonecutting.json index a104c50..51395cd 100644 --- a/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/red_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:red_stained_glass" - }, + "ingredient": "minecraft:red_stained_glass", "result": { "count": 2, "id": "mo_glass:red_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs.json index 7ffe646..02cda18 100644 --- a/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:red_stained_glass" - } + "#": "minecraft:red_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs_from_glass_stonecutting.json index f9ec3b6..99f2adc 100644 --- a/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/red_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:red_stained_glass" - }, + "ingredient": "minecraft:red_stained_glass", "result": { "count": 1, "id": "mo_glass:red_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/tinted_glass_slab.json b/src/main/resources/data/mo_glass/recipe/tinted_glass_slab.json index c143d3a..ba21fd5 100644 --- a/src/main/resources/data/mo_glass/recipe/tinted_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/tinted_glass_slab.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "minecraft:tinted_glass" - } + "#": "minecraft:tinted_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/tinted_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/tinted_glass_slab_from_glass_stonecutting.json index cb4a137..44b6d0a 100644 --- a/src/main/resources/data/mo_glass/recipe/tinted_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/tinted_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:tinted_glass" - }, + "ingredient": "minecraft:tinted_glass", "result": { "count": 2, "id": "mo_glass:tinted_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs.json index bd9695a..f8d6524 100644 --- a/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": { - "item": "minecraft:tinted_glass" - } + "#": "minecraft:tinted_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs_from_glass_stonecutting.json index 8ff1255..4228962 100644 --- a/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/tinted_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:tinted_glass" - }, + "ingredient": "minecraft:tinted_glass", "result": { "count": 1, "id": "mo_glass:tinted_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab.json index c861a72..9ef0b50 100644 --- a/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:white_stained_glass" - } + "#": "minecraft:white_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab_from_glass_stonecutting.json index f5d15fc..49b482d 100644 --- a/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/white_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:white_stained_glass" - }, + "ingredient": "minecraft:white_stained_glass", "result": { "count": 2, "id": "mo_glass:white_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs.json index 16b4290..2e16c19 100644 --- a/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:white_stained_glass" - } + "#": "minecraft:white_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs_from_glass_stonecutting.json index 1876d8b..e4a7791 100644 --- a/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/white_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:white_stained_glass" - }, + "ingredient": "minecraft:white_stained_glass", "result": { "count": 1, "id": "mo_glass:white_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab.json b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab.json index 88f2814..db80b26 100644 --- a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab.json +++ b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_slab", "key": { - "#": { - "item": "minecraft:yellow_stained_glass" - } + "#": "minecraft:yellow_stained_glass" }, "pattern": [ "###" diff --git a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab_from_glass_stonecutting.json index 2d554c7..c660c91 100644 --- a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_slab_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:yellow_stained_glass" - }, + "ingredient": "minecraft:yellow_stained_glass", "result": { "count": 2, "id": "mo_glass:yellow_stained_glass_slab" diff --git a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs.json b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs.json index 1060004..64d2921 100644 --- a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs.json +++ b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs.json @@ -3,9 +3,7 @@ "category": "building", "group": "stained_glass_stairs", "key": { - "#": { - "item": "minecraft:yellow_stained_glass" - } + "#": "minecraft:yellow_stained_glass" }, "pattern": [ "# ", diff --git a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs_from_glass_stonecutting.json b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs_from_glass_stonecutting.json index 50d5bbc..cfab036 100644 --- a/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs_from_glass_stonecutting.json +++ b/src/main/resources/data/mo_glass/recipe/yellow_stained_glass_stairs_from_glass_stonecutting.json @@ -1,8 +1,6 @@ { "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:yellow_stained_glass" - }, + "ingredient": "minecraft:yellow_stained_glass", "result": { "count": 1, "id": "mo_glass:yellow_stained_glass_stairs" diff --git a/src/main/resources/data/mo_glass/tags/block/opaque_for_lighting.json b/src/main/resources/data/mo_glass/tags/block/non_opaque_for_culling.json similarity index 100% rename from src/main/resources/data/mo_glass/tags/block/opaque_for_lighting.json rename to src/main/resources/data/mo_glass/tags/block/non_opaque_for_culling.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 094c335..6ce2d88 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,9 +29,9 @@ "mo-glass.mixins.json" ], "depends": { - "fabricloader": ">=0.15.9", - "fabric-api": ">=0.99.1", - "minecraft": "~1.21-alpha.24.21.a", + "fabricloader": ">=0.16.2", + "fabric-api": ">=0.102.2", + "minecraft": "~1.21.2-alpha.24.33.a", "java": ">=21" }, "suggests": { diff --git a/src/main/resources/mo-glass.mixins.json b/src/main/resources/mo-glass.mixins.json index 0fac045..839a8ef 100644 --- a/src/main/resources/mo-glass.mixins.json +++ b/src/main/resources/mo-glass.mixins.json @@ -3,7 +3,7 @@ "package": "net.wurstclient.glass.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "ChunkLightProviderMixin", + "BlockMixin", "GlassBlockMixin", "StainedGlassBlockMixin", "TintedGlassBlockMixin"