diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a5ce4f7..fde61af 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -37,7 +37,7 @@ jobs: - name: Build the mod run: ./gradlew build --stacktrace -x runDatagen - - name: Publish 1.17 version + - name: Publish mod uses: Kir-Antipov/mc-publish@v3.2 with: curseforge-id: 495731 @@ -47,17 +47,15 @@ jobs: files-primary: build/libs/!(*-@(dev|sources)).jar - name: 3.1.0 for MC 1.19 to 1.19.2 - version: 3.1.0+1.19 + name: 3.1.0 for MC 1.19.3 + version: 3.1.0+1.19.3 version-type: release loaders: | fabric game-versions: | - 1.19 - 1.19.1 - 1.19.2 + 1.19.3 dependencies: | fabric-api | depends diff --git a/build.gradle b/build.gradle index 06adb2c..2b6cb8a 100644 --- a/build.gradle +++ b/build.gradle @@ -51,8 +51,7 @@ dependencies { // Required Fabric API modules modImplementation(fabricApi.module("fabric-api-base", project.fabric_api_version)) - modImplementation(fabricApi.module("fabric-item-api-v1", project.fabric_api_version)) - modImplementation(fabricApi.module("fabric-item-groups-v0", project.fabric_api_version)) + modImplementation(fabricApi.module("fabric-item-group-api-v1", project.fabric_api_version)) modImplementation(fabricApi.module("fabric-blockrenderlayer-v1", project.fabric_api_version)) modImplementation(fabricApi.module("fabric-object-builder-api-v1", project.fabric_api_version)) modImplementation(fabricApi.module("fabric-data-generation-api-v1", project.fabric_api_version)) @@ -72,7 +71,6 @@ dependencies { modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}" modRuntimeOnly "maven.modrinth:lazydfu:${project.lazydfu_version}" modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}" - runtimeOnly "org.joml:joml:${project.sodium_joml_version}" modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}" modRuntimeOnly "maven.modrinth:starlight:${project.starlight_version}" modRuntimeOnly "maven.modrinth:ferrite-core:${project.ferrite_core_version}" diff --git a/gradle.properties b/gradle.properties index a715359..02e861c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,26 +7,25 @@ loom_quiltflower_version = 1.8.0 checkstyle_version = 10.5.0 # Mod Properties -mod_version = 3.1.0+1.19 +mod_version = 3.1.0+1.19.3 maven_group = com.thenamesnano archives_base_name = patterned-glass # Mod Dependencies -minecraft_version = 1.19.2 -fabric_loader_version = 0.14.11 -fabric_api_version = 0.68.0+1.19.2 -yarn_mappings = 1.19.2+build.28 +minecraft_version = 1.19.3 +fabric_loader_version = 0.14.13 +fabric_api_version = 0.73.0+1.19.3 +yarn_mappings = 1.19.3+build.5 # If true, third-party mods will be loaded during runtime in the developer run configurations use_third_party_mods = true -modmenu_version = 4.1.1 +modmenu_version = 5.0.2 lazydfu_version = 0.1.3 -sodium_version = mc1.19.2-0.4.4 -sodium_joml_version = 1.10.4 -lithium_version = mc1.19.2-0.10.2 +sodium_version = mc1.19.3-0.4.8 +lithium_version = mc1.19.3-0.10.4 starlight_version = 1.1.1+1.19 -ferrite_core_version = 5.0.3-fabric +ferrite_core_version = 5.1.0-fabric smoothboot_version = 1.19-1.7.1 no_fade_version = 3550935 diff --git a/src/main/java/com/thenamesnano/patternedglass/PatternedGlass.java b/src/main/java/com/thenamesnano/patternedglass/PatternedGlass.java index f6f5685..210efd3 100644 --- a/src/main/java/com/thenamesnano/patternedglass/PatternedGlass.java +++ b/src/main/java/com/thenamesnano/patternedglass/PatternedGlass.java @@ -1,7 +1,7 @@ package com.thenamesnano.patternedglass; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; @@ -13,8 +13,9 @@ public class PatternedGlass implements ModInitializer { public static final String MOD_ID = "patternedglass"; // ItemGroup Declaration - public static final ItemGroup PATTERNED_GLASS_BLOCKS = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "blocks"), - () -> new ItemStack(RegistryHandler.BLACK_PATTERNED_GLASS.asItem())); + public static final ItemGroup PATTERNED_GLASS_BLOCKS = FabricItemGroup.builder(new Identifier(MOD_ID, "blocks")) + .icon(() -> new ItemStack(RegistryHandler.BLACK_PATTERNED_GLASS.asItem())) + .build(); @Override public void onInitialize() { diff --git a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassBlockTagProvider.java b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassBlockTagProvider.java index aed97cb..6d2aae9 100644 --- a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassBlockTagProvider.java +++ b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassBlockTagProvider.java @@ -2,42 +2,44 @@ import java.util.Arrays; import java.util.List; +import java.util.concurrent.CompletableFuture; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.block.Block; -import net.minecraft.tag.BlockTags; -import net.minecraft.tag.TagKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.thenamesnano.patternedglass.PatternedGlass; import com.thenamesnano.patternedglass.util.RegistryHandler; public class PatternedGlassBlockTagProvider extends FabricTagProvider.BlockTagProvider { - public PatternedGlassBlockTagProvider(FabricDataGenerator dataGenerator) { - super(dataGenerator); + public PatternedGlassBlockTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); } @Override - protected void generateTags() { - List> glassBlockTagBuilders = Arrays.asList( + protected void configure(RegistryWrapper.WrapperLookup lookup) { + List glassBlockTagBuilders = Arrays.asList( getOrCreateTagBuilder(BlockTags.IMPERMEABLE), - getOrCreateTagBuilder(TagKey.of(Registry.BLOCK_KEY, new Identifier(PatternedGlass.MOD_ID, "glass_blocks"))), - getOrCreateTagBuilder(TagKey.of(Registry.BLOCK_KEY, new Identifier("c:glass")))); + getOrCreateTagBuilder(TagKey.of(RegistryKeys.BLOCK, new Identifier(PatternedGlass.MOD_ID, "glass_blocks"))), + getOrCreateTagBuilder(TagKey.of(RegistryKeys.BLOCK, new Identifier("c:glass")))); - List> glassPaneTagBuilders = Arrays.asList( - getOrCreateTagBuilder(TagKey.of(Registry.BLOCK_KEY, new Identifier(PatternedGlass.MOD_ID, "glass_panes"))), - getOrCreateTagBuilder(TagKey.of(Registry.BLOCK_KEY, new Identifier("c:glass_panes")))); + List glassPaneTagBuilders = Arrays.asList( + getOrCreateTagBuilder(TagKey.of(RegistryKeys.BLOCK, new Identifier(PatternedGlass.MOD_ID, "glass_panes"))), + getOrCreateTagBuilder(TagKey.of(RegistryKeys.BLOCK, new Identifier("c:glass_panes")))); for (Block block: RegistryHandler.GLASS_BLOCK_LIST) { - for (FabricTagBuilder tagBuilder : glassBlockTagBuilders) { + for (FabricTagBuilder tagBuilder : glassBlockTagBuilders) { tagBuilder.add(block); } } for (Block block: RegistryHandler.GLASS_PANE_BLOCK_LIST) { - for (FabricTagBuilder tagBuilder : glassPaneTagBuilders) { + for (FabricTagBuilder tagBuilder : glassPaneTagBuilders) { tagBuilder.add(block); } } diff --git a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassDatagen.java b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassDatagen.java index a0c7a2f..f4a1e30 100644 --- a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassDatagen.java +++ b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassDatagen.java @@ -6,9 +6,10 @@ public class PatternedGlassDatagen implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { - dataGenerator.addProvider(PatternedGlassLootTableProvider::new); - dataGenerator.addProvider(PatternedGlassBlockTagProvider::new); - dataGenerator.addProvider(PatternedGlassItemTagProvider::new); - dataGenerator.addProvider(PatternedGlassRecipeProvider::new); + FabricDataGenerator.Pack pack = dataGenerator.createPack(); + pack.addProvider(PatternedGlassLootTableProvider::new); + pack.addProvider(PatternedGlassBlockTagProvider::new); + pack.addProvider(PatternedGlassItemTagProvider::new); + pack.addProvider(PatternedGlassRecipeProvider::new); } } diff --git a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassItemTagProvider.java b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassItemTagProvider.java index ee03703..a759372 100644 --- a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassItemTagProvider.java +++ b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassItemTagProvider.java @@ -2,41 +2,42 @@ import java.util.Arrays; import java.util.List; +import java.util.concurrent.CompletableFuture; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.tag.TagKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.thenamesnano.patternedglass.PatternedGlass; import com.thenamesnano.patternedglass.util.RegistryHandler; public class PatternedGlassItemTagProvider extends FabricTagProvider.ItemTagProvider { - public PatternedGlassItemTagProvider(FabricDataGenerator dataGenerator) { - super(dataGenerator); + public PatternedGlassItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); } @Override - protected void generateTags() { - List> glassBlockTagBuilders = Arrays.asList( - getOrCreateTagBuilder(TagKey.of(Registry.ITEM_KEY, new Identifier(PatternedGlass.MOD_ID, "glass_blocks"))), - getOrCreateTagBuilder(TagKey.of(Registry.ITEM_KEY, new Identifier("c:glass")))); + protected void configure(RegistryWrapper.WrapperLookup arg) { + List glassBlockTagBuilders = Arrays.asList( + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier(PatternedGlass.MOD_ID, "glass_blocks"))), + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("c:glass")))); - List> glassPaneTagBuilders = Arrays.asList( - getOrCreateTagBuilder(TagKey.of(Registry.ITEM_KEY, new Identifier(PatternedGlass.MOD_ID, "glass_panes"))), - getOrCreateTagBuilder(TagKey.of(Registry.ITEM_KEY, new Identifier("c:glass_panes")))); + List glassPaneTagBuilders = Arrays.asList( + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier(PatternedGlass.MOD_ID, "glass_panes"))), + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("c:glass_panes")))); for (Block block: RegistryHandler.GLASS_BLOCK_LIST) { - for (FabricTagBuilder tagBuilder : glassBlockTagBuilders) { + for (FabricTagBuilder tagBuilder : glassBlockTagBuilders) { tagBuilder.add(block.asItem()); } } for (Block block: RegistryHandler.GLASS_PANE_BLOCK_LIST) { - for (FabricTagBuilder tagBuilder : glassPaneTagBuilders) { + for (FabricTagBuilder tagBuilder : glassPaneTagBuilders) { tagBuilder.add(block.asItem()); } } diff --git a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassLootTableProvider.java b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassLootTableProvider.java index 8959bcc..87a39df 100644 --- a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassLootTableProvider.java +++ b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassLootTableProvider.java @@ -1,18 +1,18 @@ package com.thenamesnano.patternedglass.datagen; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.minecraft.block.Block; import com.thenamesnano.patternedglass.util.RegistryHandler; public class PatternedGlassLootTableProvider extends FabricBlockLootTableProvider { - public PatternedGlassLootTableProvider(FabricDataGenerator dataGenerator) { - super(dataGenerator); + protected PatternedGlassLootTableProvider(FabricDataOutput dataOutput) { + super(dataOutput); } @Override - protected void generateBlockLootTables() { + public void generate() { for (Block block: RegistryHandler.GLASS_BLOCK_LIST) { addDropWithSilkTouch(block); } diff --git a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassRecipeProvider.java b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassRecipeProvider.java index 2116d65..2c856fe 100644 --- a/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassRecipeProvider.java +++ b/src/main/java/com/thenamesnano/patternedglass/datagen/PatternedGlassRecipeProvider.java @@ -2,29 +2,23 @@ import java.util.function.Consumer; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.block.Blocks; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.item.ItemConvertible; -import net.minecraft.util.Identifier; +import net.minecraft.recipe.book.RecipeCategory; -import com.thenamesnano.patternedglass.PatternedGlass; import com.thenamesnano.patternedglass.util.RegistryHandler; public class PatternedGlassRecipeProvider extends FabricRecipeProvider { - public PatternedGlassRecipeProvider(FabricDataGenerator dataGenerator) { - super(dataGenerator); + public PatternedGlassRecipeProvider(FabricDataOutput output) { + super(output); } @Override - protected Identifier getRecipeIdentifier(Identifier identifier) { - return new Identifier(PatternedGlass.MOD_ID, identifier.getPath()); - } - - @Override - protected void generateRecipes(Consumer exporter) { + public void generate(Consumer exporter) { offerPatternedGlassDyeingRecipe(exporter, RegistryHandler.WHITE_PATTERNED_GLASS, Blocks.WHITE_GLAZED_TERRACOTTA); offerPatternedGlassDyeingRecipe(exporter, RegistryHandler.ORANGE_PATTERNED_GLASS, Blocks.ORANGE_GLAZED_TERRACOTTA); offerPatternedGlassDyeingRecipe(exporter, RegistryHandler.MAGENTA_PATTERNED_GLASS, Blocks.MAGENTA_GLAZED_TERRACOTTA); @@ -78,7 +72,7 @@ protected void generateRecipes(Consumer exporter) { } private static void offerPatternedGlassDyeingRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { - ShapedRecipeJsonBuilder.create(output, 8) + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 8) .input('#', Blocks.GLASS) .input('X', input) .pattern("###") @@ -91,7 +85,7 @@ private static void offerPatternedGlassDyeingRecipe(Consumer } private static void offerPatternedGlassPaneRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { - ShapedRecipeJsonBuilder.create(output, 16) + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 16) .input('#', input) .pattern("###") .pattern("###") @@ -101,7 +95,7 @@ private static void offerPatternedGlassPaneRecipe(Consumer e } private static void offerPatternedGlassPaneDyeingRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { - ShapedRecipeJsonBuilder.create(output, 8) + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 8) .input('#', Blocks.GLASS_PANE) .input('$', input) .pattern("###") diff --git a/src/main/java/com/thenamesnano/patternedglass/init/blocks/BlockItemBase.java b/src/main/java/com/thenamesnano/patternedglass/init/blocks/BlockItemBase.java index 41a41ce..6ae25f8 100644 --- a/src/main/java/com/thenamesnano/patternedglass/init/blocks/BlockItemBase.java +++ b/src/main/java/com/thenamesnano/patternedglass/init/blocks/BlockItemBase.java @@ -1,13 +1,17 @@ package com.thenamesnano.patternedglass.init.blocks; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; import com.thenamesnano.patternedglass.PatternedGlass; public class BlockItemBase extends BlockItem { public BlockItemBase(Block block) { - super(block, new FabricItemSettings().group(PatternedGlass.PATTERNED_GLASS_BLOCKS)); + super(block, new Item.Settings()); + + ItemGroupEvents.modifyEntriesEvent(PatternedGlass.PATTERNED_GLASS_BLOCKS) + .register(entries -> entries.add(block)); } } diff --git a/src/main/java/com/thenamesnano/patternedglass/util/RegistryHandler.java b/src/main/java/com/thenamesnano/patternedglass/util/RegistryHandler.java index 3a473dc..1a2137b 100644 --- a/src/main/java/com/thenamesnano/patternedglass/util/RegistryHandler.java +++ b/src/main/java/com/thenamesnano/patternedglass/util/RegistryHandler.java @@ -4,9 +4,10 @@ import java.util.List; import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.thenamesnano.patternedglass.PatternedGlass; import com.thenamesnano.patternedglass.init.blocks.BlockItemBase; @@ -55,13 +56,13 @@ public class RegistryHandler { public static void init() { for (PatternedGlassBlock block : GLASS_BLOCK_LIST) { - Registry.register(Registry.BLOCK, new Identifier(PatternedGlass.MOD_ID, block.getKey()), block); - Registry.register(Registry.ITEM, new Identifier(PatternedGlass.MOD_ID, block.getKey()), new BlockItemBase(block)); + Registry.register(Registries.BLOCK, new Identifier(PatternedGlass.MOD_ID, block.getKey()), block); + Registry.register(Registries.ITEM, new Identifier(PatternedGlass.MOD_ID, block.getKey()), new BlockItemBase(block)); } for (PatternedGlassPaneBlock block : GLASS_PANE_BLOCK_LIST) { - Registry.register(Registry.BLOCK, new Identifier(PatternedGlass.MOD_ID, block.getKey()), block); - Registry.register(Registry.ITEM, new Identifier(PatternedGlass.MOD_ID, block.getKey()), new BlockItemBase(block)); + Registry.register(Registries.BLOCK, new Identifier(PatternedGlass.MOD_ID, block.getKey()), block); + Registry.register(Registries.ITEM, new Identifier(PatternedGlass.MOD_ID, block.getKey()), new BlockItemBase(block)); } } } diff --git a/src/main/resources/assets/patternedglass/lang/en_us.json b/src/main/resources/assets/patternedglass/lang/en_us.json index 235e11a..3a0b884 100644 --- a/src/main/resources/assets/patternedglass/lang/en_us.json +++ b/src/main/resources/assets/patternedglass/lang/en_us.json @@ -1,7 +1,5 @@ { - "config.patternedglass.modEnabled": "Mod Enabled", "itemGroup.patternedglass.blocks": "Patterned Glass", - "block.patternedglass.test_block": "Test Block", "block.patternedglass.white_patterned_glass": "White Patterned Glass", "block.patternedglass.orange_patterned_glass": "Orange Patterned Glass", "block.patternedglass.magenta_patterned_glass": "Magenta Patterned Glass", @@ -34,4 +32,4 @@ "block.patternedglass.green_patterned_glass_pane": "Green Patterned Glass Pane", "block.patternedglass.red_patterned_glass_pane": "Red Patterned Glass Pane", "block.patternedglass.black_patterned_glass_pane": "Black Patterned Glass Pane" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass.json index 6f79587..7aabac3 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/black_patterned_glass" + "pattern": "patternedglass:block/black_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside.json index 95ba204..90fe3a9 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/black_patterned_glass" + "pane": "patternedglass:block/black_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside_alt.json index 9610e0e..71eb4b1 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/black_patterned_glass" + "pane": "patternedglass:block/black_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_post.json index 7e32bfc..8c961ac 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/black_patterned_glass", - "edge": "patternedglass:blocks/black_patterned_glass_pane_top" + "pane": "patternedglass:block/black_patterned_glass", + "edge": "patternedglass:block/black_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side.json index ca7ba41..a1cbbc8 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/black_patterned_glass", - "edge": "patternedglass:blocks/black_patterned_glass_pane_top" + "pane": "patternedglass:block/black_patterned_glass", + "edge": "patternedglass:block/black_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side_alt.json index 0c296e6..a3d2f87 100644 --- a/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/black_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/black_patterned_glass", - "edge": "patternedglass:blocks/black_patterned_glass_pane_top" + "pane": "patternedglass:block/black_patterned_glass", + "edge": "patternedglass:block/black_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass.json index fad15f0..ca9a83a 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/blue_patterned_glass" + "pattern": "patternedglass:block/blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside.json index 35d7bc2..08c2a66 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/blue_patterned_glass" + "pane": "patternedglass:block/blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside_alt.json index 444abf7..14e6e0b 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/blue_patterned_glass" + "pane": "patternedglass:block/blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_post.json index aa6d202..d8eaa60 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/blue_patterned_glass", - "edge": "patternedglass:blocks/blue_patterned_glass_pane_top" + "pane": "patternedglass:block/blue_patterned_glass", + "edge": "patternedglass:block/blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side.json index 61c46b0..3768f0f 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/blue_patterned_glass", - "edge": "patternedglass:blocks/blue_patterned_glass_pane_top" + "pane": "patternedglass:block/blue_patterned_glass", + "edge": "patternedglass:block/blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side_alt.json index f9a7660..d824058 100644 --- a/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/blue_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/blue_patterned_glass", - "edge": "patternedglass:blocks/blue_patterned_glass_pane_top" + "pane": "patternedglass:block/blue_patterned_glass", + "edge": "patternedglass:block/blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass.json index e8e7ace..cd9362d 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/brown_patterned_glass" + "pattern": "patternedglass:block/brown_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside.json index 401b835..85f80d6 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/brown_patterned_glass" + "pane": "patternedglass:block/brown_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside_alt.json index d6ed28f..5dbaf7f 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/brown_patterned_glass" + "pane": "patternedglass:block/brown_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_post.json index 65d67a1..bf0bfee 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/brown_patterned_glass", - "edge": "patternedglass:blocks/brown_patterned_glass_pane_top" + "pane": "patternedglass:block/brown_patterned_glass", + "edge": "patternedglass:block/brown_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side.json index 00c97d9..04821db 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/brown_patterned_glass", - "edge": "patternedglass:blocks/brown_patterned_glass_pane_top" + "pane": "patternedglass:block/brown_patterned_glass", + "edge": "patternedglass:block/brown_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side_alt.json index 950efd2..50e2ffd 100644 --- a/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/brown_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/brown_patterned_glass", - "edge": "patternedglass:blocks/brown_patterned_glass_pane_top" + "pane": "patternedglass:block/brown_patterned_glass", + "edge": "patternedglass:block/brown_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass.json index b9ef971..72d9cb1 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/cyan_patterned_glass" + "pattern": "patternedglass:block/cyan_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside.json index e049d2c..998ef64 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/cyan_patterned_glass" + "pane": "patternedglass:block/cyan_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside_alt.json index ca57203..95e9954 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/cyan_patterned_glass" + "pane": "patternedglass:block/cyan_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_post.json index 802d028..85d4617 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/cyan_patterned_glass", - "edge": "patternedglass:blocks/cyan_patterned_glass_pane_top" + "pane": "patternedglass:block/cyan_patterned_glass", + "edge": "patternedglass:block/cyan_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side.json index aaf5489..94279ee 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/cyan_patterned_glass", - "edge": "patternedglass:blocks/cyan_patterned_glass_pane_top" + "pane": "patternedglass:block/cyan_patterned_glass", + "edge": "patternedglass:block/cyan_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side_alt.json index 3f54764..76f3ba2 100644 --- a/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/cyan_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/cyan_patterned_glass", - "edge": "patternedglass:blocks/cyan_patterned_glass_pane_top" + "pane": "patternedglass:block/cyan_patterned_glass", + "edge": "patternedglass:block/cyan_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass.json index 6315afd..3776421 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/gray_patterned_glass" + "pattern": "patternedglass:block/gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside.json index e8aa2d1..83347a9 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/gray_patterned_glass" + "pane": "patternedglass:block/gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside_alt.json index 84768f7..15aae5a 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/gray_patterned_glass" + "pane": "patternedglass:block/gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_post.json index 0718882..738d22f 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/gray_patterned_glass", - "edge": "patternedglass:blocks/gray_patterned_glass_pane_top" + "pane": "patternedglass:block/gray_patterned_glass", + "edge": "patternedglass:block/gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side.json index 6003e10..42e61ec 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/gray_patterned_glass", - "edge": "patternedglass:blocks/gray_patterned_glass_pane_top" + "pane": "patternedglass:block/gray_patterned_glass", + "edge": "patternedglass:block/gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side_alt.json index 0c10825..87bf00c 100644 --- a/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/gray_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/gray_patterned_glass", - "edge": "patternedglass:blocks/gray_patterned_glass_pane_top" + "pane": "patternedglass:block/gray_patterned_glass", + "edge": "patternedglass:block/gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass.json index 6addcbb..a27f832 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/green_patterned_glass" + "pattern": "patternedglass:block/green_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside.json index 2c934b1..9dc81b2 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/green_patterned_glass" + "pane": "patternedglass:block/green_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside_alt.json index 0d70147..893db22 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/green_patterned_glass" + "pane": "patternedglass:block/green_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_post.json index f13f93a..6594fb8 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/green_patterned_glass", - "edge": "patternedglass:blocks/green_patterned_glass_pane_top" + "pane": "patternedglass:block/green_patterned_glass", + "edge": "patternedglass:block/green_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side.json index 3c65507..cfea858 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/green_patterned_glass", - "edge": "patternedglass:blocks/green_patterned_glass_pane_top" + "pane": "patternedglass:block/green_patterned_glass", + "edge": "patternedglass:block/green_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side_alt.json index a95d2ec..f4115f4 100644 --- a/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/green_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/green_patterned_glass", - "edge": "patternedglass:blocks/green_patterned_glass_pane_top" + "pane": "patternedglass:block/green_patterned_glass", + "edge": "patternedglass:block/green_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass.json index 44bb214..c684b3a 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/light_blue_patterned_glass" + "pattern": "patternedglass:block/light_blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside.json index fea48c5..f73431d 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/light_blue_patterned_glass" + "pane": "patternedglass:block/light_blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside_alt.json index 028e75e..24022a8 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/light_blue_patterned_glass" + "pane": "patternedglass:block/light_blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_post.json index af8e34b..290bf8e 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/light_blue_patterned_glass", - "edge": "patternedglass:blocks/light_blue_patterned_glass_pane_top" + "pane": "patternedglass:block/light_blue_patterned_glass", + "edge": "patternedglass:block/light_blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side.json index 5dbc593..86c16fe 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/light_blue_patterned_glass", - "edge": "patternedglass:blocks/light_blue_patterned_glass_pane_top" + "pane": "patternedglass:block/light_blue_patterned_glass", + "edge": "patternedglass:block/light_blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side_alt.json index 97b18c1..173958d 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/light_blue_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/light_blue_patterned_glass", - "edge": "patternedglass:blocks/light_blue_patterned_glass_pane_top" + "pane": "patternedglass:block/light_blue_patterned_glass", + "edge": "patternedglass:block/light_blue_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass.json index a8b9936..f5d5b3d 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/light_gray_patterned_glass" + "pattern": "patternedglass:block/light_gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside.json index 78b459b..533ef2d 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/light_gray_patterned_glass" + "pane": "patternedglass:block/light_gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside_alt.json index 7dfefb6..0387402 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/light_gray_patterned_glass" + "pane": "patternedglass:block/light_gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_post.json index 3568f69..15dd006 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/light_gray_patterned_glass", - "edge": "patternedglass:blocks/light_gray_patterned_glass_pane_top" + "pane": "patternedglass:block/light_gray_patterned_glass", + "edge": "patternedglass:block/light_gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side.json index f92df13..e88f4e7 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/light_gray_patterned_glass", - "edge": "patternedglass:blocks/light_gray_patterned_glass_pane_top" + "pane": "patternedglass:block/light_gray_patterned_glass", + "edge": "patternedglass:block/light_gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side_alt.json index 2cb9624..b4032b6 100644 --- a/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/light_gray_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/light_gray_patterned_glass", - "edge": "patternedglass:blocks/light_gray_patterned_glass_pane_top" + "pane": "patternedglass:block/light_gray_patterned_glass", + "edge": "patternedglass:block/light_gray_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass.json index 4895775..0440685 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/lime_patterned_glass" + "pattern": "patternedglass:block/lime_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside.json index 3e89c4e..12442ef 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/lime_patterned_glass" + "pane": "patternedglass:block/lime_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside_alt.json index 441e01a..90b03d2 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/lime_patterned_glass" + "pane": "patternedglass:block/lime_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_post.json index 53dcefe..33274fd 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/lime_patterned_glass", - "edge": "patternedglass:blocks/lime_patterned_glass_pane_top" + "pane": "patternedglass:block/lime_patterned_glass", + "edge": "patternedglass:block/lime_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side.json index e6ed9f2..085c929 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/lime_patterned_glass", - "edge": "patternedglass:blocks/lime_patterned_glass_pane_top" + "pane": "patternedglass:block/lime_patterned_glass", + "edge": "patternedglass:block/lime_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side_alt.json index 2326cd5..dcb6eca 100644 --- a/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/lime_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/lime_patterned_glass", - "edge": "patternedglass:blocks/lime_patterned_glass_pane_top" + "pane": "patternedglass:block/lime_patterned_glass", + "edge": "patternedglass:block/lime_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass.json index 4cc4a6b..7f74d64 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/magenta_patterned_glass" + "pattern": "patternedglass:block/magenta_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside.json index cd478d5..c6bf262 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/magenta_patterned_glass" + "pane": "patternedglass:block/magenta_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside_alt.json index 0d7e290..ac45881 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/magenta_patterned_glass" + "pane": "patternedglass:block/magenta_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_post.json index c1c905c..f17f000 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/magenta_patterned_glass", - "edge": "patternedglass:blocks/magenta_patterned_glass_pane_top" + "pane": "patternedglass:block/magenta_patterned_glass", + "edge": "patternedglass:block/magenta_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side.json index 0cd7d7b..d194ba4 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/magenta_patterned_glass", - "edge": "patternedglass:blocks/magenta_patterned_glass_pane_top" + "pane": "patternedglass:block/magenta_patterned_glass", + "edge": "patternedglass:block/magenta_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side_alt.json index d2180c2..be6e47f 100644 --- a/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/magenta_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/magenta_patterned_glass", - "edge": "patternedglass:blocks/magenta_patterned_glass_pane_top" + "pane": "patternedglass:block/magenta_patterned_glass", + "edge": "patternedglass:block/magenta_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass.json index 1475f20..dd95a1a 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/orange_patterned_glass" + "pattern": "patternedglass:block/orange_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside.json index d41330d..e575fcd 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/orange_patterned_glass" + "pane": "patternedglass:block/orange_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside_alt.json index 0dec72c..2e880df 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/orange_patterned_glass" + "pane": "patternedglass:block/orange_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_post.json index 4a9473a..bc68b34 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/orange_patterned_glass", - "edge": "patternedglass:blocks/orange_patterned_glass_pane_top" + "pane": "patternedglass:block/orange_patterned_glass", + "edge": "patternedglass:block/orange_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side.json index 3568bfe..947cd28 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/orange_patterned_glass", - "edge": "patternedglass:blocks/orange_patterned_glass_pane_top" + "pane": "patternedglass:block/orange_patterned_glass", + "edge": "patternedglass:block/orange_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side_alt.json index 57b531f..84688c8 100644 --- a/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/orange_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/orange_patterned_glass", - "edge": "patternedglass:blocks/orange_patterned_glass_pane_top" + "pane": "patternedglass:block/orange_patterned_glass", + "edge": "patternedglass:block/orange_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass.json index 80905bc..3cfda95 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/pink_patterned_glass" + "pattern": "patternedglass:block/pink_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside.json index 20f969d..1cd5ede 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/pink_patterned_glass" + "pane": "patternedglass:block/pink_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside_alt.json index 145102b..0187d57 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/pink_patterned_glass" + "pane": "patternedglass:block/pink_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_post.json index f19748f..bca4bf1 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/pink_patterned_glass", - "edge": "patternedglass:blocks/pink_patterned_glass_pane_top" + "pane": "patternedglass:block/pink_patterned_glass", + "edge": "patternedglass:block/pink_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side.json index 06f5d2b..030cef3 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/pink_patterned_glass", - "edge": "patternedglass:blocks/pink_patterned_glass_pane_top" + "pane": "patternedglass:block/pink_patterned_glass", + "edge": "patternedglass:block/pink_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side_alt.json index 490817e..7875bae 100644 --- a/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/pink_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/pink_patterned_glass", - "edge": "patternedglass:blocks/pink_patterned_glass_pane_top" + "pane": "patternedglass:block/pink_patterned_glass", + "edge": "patternedglass:block/pink_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass.json index 50333d7..b9db8d4 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/purple_patterned_glass" + "pattern": "patternedglass:block/purple_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside.json index 965068f..a209681 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/purple_patterned_glass" + "pane": "patternedglass:block/purple_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside_alt.json index ad97aba..442ead3 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/purple_patterned_glass" + "pane": "patternedglass:block/purple_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_post.json index f235a8a..102cf11 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/purple_patterned_glass", - "edge": "patternedglass:blocks/purple_patterned_glass_pane_top" + "pane": "patternedglass:block/purple_patterned_glass", + "edge": "patternedglass:block/purple_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side.json index 48ce757..0e68fce 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/purple_patterned_glass", - "edge": "patternedglass:blocks/purple_patterned_glass_pane_top" + "pane": "patternedglass:block/purple_patterned_glass", + "edge": "patternedglass:block/purple_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side_alt.json index f7843ba..f3bb676 100644 --- a/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/purple_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/purple_patterned_glass", - "edge": "patternedglass:blocks/purple_patterned_glass_pane_top" + "pane": "patternedglass:block/purple_patterned_glass", + "edge": "patternedglass:block/purple_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass.json index 330d028..43fea57 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/red_patterned_glass" + "pattern": "patternedglass:block/red_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside.json index 73c9a10..ad92926 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/red_patterned_glass" + "pane": "patternedglass:block/red_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside_alt.json index 8e9cd19..80c24ac 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/red_patterned_glass" + "pane": "patternedglass:block/red_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_post.json index 8d04d24..29cbad2 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/red_patterned_glass", - "edge": "patternedglass:blocks/red_patterned_glass_pane_top" + "pane": "patternedglass:block/red_patterned_glass", + "edge": "patternedglass:block/red_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side.json index 09f1a21..eaf56e6 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/red_patterned_glass", - "edge": "patternedglass:blocks/red_patterned_glass_pane_top" + "pane": "patternedglass:block/red_patterned_glass", + "edge": "patternedglass:block/red_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side_alt.json index 834635d..0b05d40 100644 --- a/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/red_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/red_patterned_glass", - "edge": "patternedglass:blocks/red_patterned_glass_pane_top" + "pane": "patternedglass:block/red_patterned_glass", + "edge": "patternedglass:block/red_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/template_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/template_patterned_glass.json index c6574a9..7a920d5 100644 --- a/src/main/resources/assets/patternedglass/models/block/template_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/template_patterned_glass.json @@ -1,5 +1,5 @@ { - "parent": "block/cube", + "parent": "minecraft:block/cube_all", "textures": { "particle": "#pattern" }, diff --git a/src/main/resources/assets/patternedglass/models/block/test_block.json b/src/main/resources/assets/patternedglass/models/block/test_block.json index e0e67df..d6ce4c9 100644 --- a/src/main/resources/assets/patternedglass/models/block/test_block.json +++ b/src/main/resources/assets/patternedglass/models/block/test_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "patternedglass:blocks/debug" + "all": "patternedglass:block/debug" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass.json index 3a9180c..118351e 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/white_patterned_glass" + "pattern": "patternedglass:block/white_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside.json index 328bbc1..e47e661 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/white_patterned_glass" + "pane": "patternedglass:block/white_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside_alt.json index 2c9f989..c1dd816 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/white_patterned_glass" + "pane": "patternedglass:block/white_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_post.json index c107d9c..c0ef237 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/white_patterned_glass", - "edge": "patternedglass:blocks/white_patterned_glass_pane_top" + "pane": "patternedglass:block/white_patterned_glass", + "edge": "patternedglass:block/white_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side.json index edfe6db..a9deccf 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/white_patterned_glass", - "edge": "patternedglass:blocks/white_patterned_glass_pane_top" + "pane": "patternedglass:block/white_patterned_glass", + "edge": "patternedglass:block/white_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side_alt.json index f5b63c0..fd13e5f 100644 --- a/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/white_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/white_patterned_glass", - "edge": "patternedglass:blocks/white_patterned_glass_pane_top" + "pane": "patternedglass:block/white_patterned_glass", + "edge": "patternedglass:block/white_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass.json index 31953aa..efc19d2 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass.json @@ -1,6 +1,6 @@ { "parent": "patternedglass:block/template_patterned_glass", "textures": { - "pattern": "patternedglass:blocks/yellow_patterned_glass" + "pattern": "patternedglass:block/yellow_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside.json index 6df02ca..9389db9 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "patternedglass:blocks/yellow_patterned_glass" + "pane": "patternedglass:block/yellow_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside_alt.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside_alt.json index 009b5b4..c1d54f6 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "patternedglass:blocks/yellow_patterned_glass" + "pane": "patternedglass:block/yellow_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_post.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_post.json index cca465c..e84c420 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_post.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "patternedglass:blocks/yellow_patterned_glass", - "edge": "patternedglass:blocks/yellow_patterned_glass_pane_top" + "pane": "patternedglass:block/yellow_patterned_glass", + "edge": "patternedglass:block/yellow_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side.json index 1131e0d..c3f718c 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "patternedglass:blocks/yellow_patterned_glass", - "edge": "patternedglass:blocks/yellow_patterned_glass_pane_top" + "pane": "patternedglass:block/yellow_patterned_glass", + "edge": "patternedglass:block/yellow_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side_alt.json b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side_alt.json index 4aea3e5..fd48d7d 100644 --- a/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side_alt.json +++ b/src/main/resources/assets/patternedglass/models/block/yellow_patterned_glass_pane_side_alt.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "patternedglass:blocks/yellow_patterned_glass", - "edge": "patternedglass:blocks/yellow_patterned_glass_pane_top" + "pane": "patternedglass:block/yellow_patterned_glass", + "edge": "patternedglass:block/yellow_patterned_glass_pane_top" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/black_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/black_patterned_glass_pane.json index 3bfb652..419e658 100644 --- a/src/main/resources/assets/patternedglass/models/item/black_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/black_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/black_patterned_glass" + "layer0": "patternedglass:block/black_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/blue_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/blue_patterned_glass_pane.json index 9cedb38..9dc73c9 100644 --- a/src/main/resources/assets/patternedglass/models/item/blue_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/blue_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/blue_patterned_glass" + "layer0": "patternedglass:block/blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/brown_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/brown_patterned_glass_pane.json index 7dd9711..3dcdfeb 100644 --- a/src/main/resources/assets/patternedglass/models/item/brown_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/brown_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/brown_patterned_glass" + "layer0": "patternedglass:block/brown_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/cyan_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/cyan_patterned_glass_pane.json index ca5e103..e9ccd14 100644 --- a/src/main/resources/assets/patternedglass/models/item/cyan_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/cyan_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/cyan_patterned_glass" + "layer0": "patternedglass:block/cyan_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/gray_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/gray_patterned_glass_pane.json index 7c72507..900924e 100644 --- a/src/main/resources/assets/patternedglass/models/item/gray_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/gray_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/gray_patterned_glass" + "layer0": "patternedglass:block/gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/green_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/green_patterned_glass_pane.json index c715fc7..2ef235c 100644 --- a/src/main/resources/assets/patternedglass/models/item/green_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/green_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/green_patterned_glass" + "layer0": "patternedglass:block/green_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/light_blue_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/light_blue_patterned_glass_pane.json index f828c11..f0c8249 100644 --- a/src/main/resources/assets/patternedglass/models/item/light_blue_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/light_blue_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/light_blue_patterned_glass" + "layer0": "patternedglass:block/light_blue_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/light_gray_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/light_gray_patterned_glass_pane.json index 8886d0c..e44d307 100644 --- a/src/main/resources/assets/patternedglass/models/item/light_gray_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/light_gray_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/light_gray_patterned_glass" + "layer0": "patternedglass:block/light_gray_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/lime_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/lime_patterned_glass_pane.json index b1cf5b6..f44d0db 100644 --- a/src/main/resources/assets/patternedglass/models/item/lime_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/lime_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/lime_patterned_glass" + "layer0": "patternedglass:block/lime_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/magenta_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/magenta_patterned_glass_pane.json index 90dfcc5..0977706 100644 --- a/src/main/resources/assets/patternedglass/models/item/magenta_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/magenta_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/magenta_patterned_glass" + "layer0": "patternedglass:block/magenta_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/orange_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/orange_patterned_glass_pane.json index ed05507..1135e6e 100644 --- a/src/main/resources/assets/patternedglass/models/item/orange_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/orange_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/orange_patterned_glass" + "layer0": "patternedglass:block/orange_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/pink_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/pink_patterned_glass_pane.json index f2064c5..2669d52 100644 --- a/src/main/resources/assets/patternedglass/models/item/pink_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/pink_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/pink_patterned_glass" + "layer0": "patternedglass:block/pink_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/purple_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/purple_patterned_glass_pane.json index 4fb4d2b..383cffd 100644 --- a/src/main/resources/assets/patternedglass/models/item/purple_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/purple_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/purple_patterned_glass" + "layer0": "patternedglass:block/purple_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/red_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/red_patterned_glass_pane.json index 320181d..5a58ed5 100644 --- a/src/main/resources/assets/patternedglass/models/item/red_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/red_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/red_patterned_glass" + "layer0": "patternedglass:block/red_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/white_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/white_patterned_glass_pane.json index c64f0f9..a10502b 100644 --- a/src/main/resources/assets/patternedglass/models/item/white_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/white_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/white_patterned_glass" + "layer0": "patternedglass:block/white_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/models/item/yellow_patterned_glass_pane.json b/src/main/resources/assets/patternedglass/models/item/yellow_patterned_glass_pane.json index efd1c26..887f689 100644 --- a/src/main/resources/assets/patternedglass/models/item/yellow_patterned_glass_pane.json +++ b/src/main/resources/assets/patternedglass/models/item/yellow_patterned_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "patternedglass:blocks/yellow_patterned_glass" + "layer0": "patternedglass:block/yellow_patterned_glass" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/patternedglass/textures/blocks/black_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/black_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/black_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/black_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/black_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/black_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/black_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/black_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/blue_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/blue_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/blue_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/blue_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/blue_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/blue_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/blue_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/blue_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/brown_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/brown_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/brown_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/brown_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/brown_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/brown_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/brown_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/brown_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/cyan_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/cyan_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/cyan_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/cyan_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/cyan_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/cyan_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/cyan_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/cyan_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/debug.png b/src/main/resources/assets/patternedglass/textures/block/debug.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/debug.png rename to src/main/resources/assets/patternedglass/textures/block/debug.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/gray_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/gray_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/gray_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/gray_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/gray_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/gray_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/gray_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/gray_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/green_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/green_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/green_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/green_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/green_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/green_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/green_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/green_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/light_blue_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/light_blue_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/light_blue_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/light_blue_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/light_blue_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/light_blue_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/light_blue_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/light_blue_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/light_gray_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/light_gray_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/light_gray_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/light_gray_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/light_gray_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/light_gray_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/light_gray_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/light_gray_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/lime_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/lime_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/lime_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/lime_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/lime_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/lime_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/lime_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/lime_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/magenta_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/magenta_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/magenta_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/magenta_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/magenta_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/magenta_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/magenta_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/magenta_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/orange_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/orange_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/orange_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/orange_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/orange_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/orange_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/orange_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/orange_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/pink_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/pink_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/pink_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/pink_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/pink_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/pink_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/pink_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/pink_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/purple_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/purple_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/purple_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/purple_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/purple_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/purple_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/purple_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/purple_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/red_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/red_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/red_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/red_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/red_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/red_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/red_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/red_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/white_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/white_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/white_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/white_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/white_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/white_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/white_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/white_patterned_glass_pane_top.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/yellow_patterned_glass.png b/src/main/resources/assets/patternedglass/textures/block/yellow_patterned_glass.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/yellow_patterned_glass.png rename to src/main/resources/assets/patternedglass/textures/block/yellow_patterned_glass.png diff --git a/src/main/resources/assets/patternedglass/textures/blocks/yellow_patterned_glass_pane_top.png b/src/main/resources/assets/patternedglass/textures/block/yellow_patterned_glass_pane_top.png similarity index 100% rename from src/main/resources/assets/patternedglass/textures/blocks/yellow_patterned_glass_pane_top.png rename to src/main/resources/assets/patternedglass/textures/block/yellow_patterned_glass_pane_top.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 34a6332..9cabe36 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -7,7 +7,8 @@ "authors": [ "Nano (thenamesnano)", "thefirethirteen", - "NebelNidas" + "NebelNidas", + "TacoMonkey" ], "contact": { "homepage": "https://www.curseforge.com/minecraft/mc-mods/patterned-glass", @@ -29,9 +30,8 @@ ] }, "depends": { - "minecraft": ">=1.19", - "fabric-item-api-v1": "*", - "fabric-item-groups-v0": "*", + "minecraft": ">=1.19.3", + "fabric-item-group-api-v1": "*", "fabric-blockrenderlayer-v1": "*", "fabric-object-builder-api-v1": "*" } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta deleted file mode 100644 index 2ec7f3c..0000000 --- a/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "patternedglass resources", - "pack_format": 6 - } -}