diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 4fb663182..19b650058 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -40,6 +40,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.lens.ItemLens; +import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.lib.LibMisc; import java.awt.Color; @@ -113,10 +114,11 @@ public final class ColorHandler { : -1, ModItems.twigWand); - IItemColor handler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue; + IItemColor petalHandler = (s, t) -> ((ItemPetal) s.getItem()).color.colorValue; + IItemColor dyeHandler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue; for(EnumDyeColor color : EnumDyeColor.values()) { - items.register(handler, ModItems.getPetal(color)); - items.register(handler, ModItems.getDye(color)); + items.register(petalHandler, ModItems.getPetal(color)); + items.register(dyeHandler, ModItems.getDye(color)); } items.register((s, t) -> Minecraft.getInstance().getBlockColors().getColor(((ItemBlock)s.getItem()).getBlock().getDefaultState(), null, null, t), @@ -171,8 +173,8 @@ public final class ColorHandler { items.register((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(Util.milliTime() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); - handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; - items.register(handler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce, + dyeHandler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; + items.register(dyeHandler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce, ModItems.lensGravity, ModItems.lensMine, ModItems.lensDamage, ModItems.lensPhantom, ModItems.lensMagnet, ModItems.lensExplosive, ModItems.lensWeight, ModItems.lensPaint, ModItems.lensFire, ModItems.lensPiston, ModItems.lensLight, ModItems.lensWarp, ModItems.lensRedirect, ModItems.lensFirework, ModItems.lensFlare, diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 52ceb35a9..ed77702fb 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -27,12 +27,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.client.render.tile.RenderTileBrewery; -import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; -import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; @@ -118,7 +114,6 @@ import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibOreDict; import java.util.Locale; @@ -282,7 +277,7 @@ public final class ModBlocks { @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 15) public static Block azulejo15; @ObjectHolder(LibBlockNames.ENDER_EYE_BLOCK) public static Block enderEye; @ObjectHolder(LibBlockNames.STARFIELD) public static Block starfield; - @ObjectHolder(LibBlockNames.RF_GENERATOR) public static Block rfGenerator; + @ObjectHolder(LibBlockNames.FLUXFIELD) public static Block rfGenerator; @ObjectHolder(LibBlockNames.ELF_GLASS) public static Block elfGlass; @ObjectHolder(LibBlockNames.BREWERY) public static Block brewery; @ObjectHolder(LibBlockNames.MANA_GLASS) public static Block manaGlass; @@ -519,7 +514,7 @@ public final class ModBlocks { register(r, new BlockEnderEye(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.ENDER_EYE_BLOCK); register(r, new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)), LibBlockNames.STARFIELD); - register(r, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.RF_GENERATOR); + register(r, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.FLUXFIELD); register(r, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.ELF_GLASS); register(r, new BlockBrewery(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.BREWERY); register(r, new BlockManaGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15)), LibBlockNames.MANA_GLASS); @@ -868,7 +863,7 @@ public final class ModBlocks { r.register(TileEntityType.Builder.create(TileSpawnerClaw::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPAWNER_CLAW)); r.register(TileEntityType.Builder.create(TileEnderEye::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENDER_EYE_BLOCK)); r.register(TileEntityType.Builder.create(TileStarfield::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.STARFIELD)); - r.register(TileEntityType.Builder.create(TileRFGenerator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RF_GENERATOR)); + r.register(TileEntityType.Builder.create(TileRFGenerator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLUXFIELD)); r.register(TileEntityType.Builder.create(TileBrewery::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BREWERY)); r.register(TileEntityType.Builder.create(TileTerraPlate::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERRA_PLATE)); r.register(TileEntityType.Builder.create(TileRedStringContainer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_CONTAINER)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index c9a7d6290..53e29d9d5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileRFGenerator extends TileMod implements IManaReceiver, ITickable { - @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.RF_GENERATOR) + @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.FLUXFIELD) public static TileEntityType TYPE; private static final int MANA_TO_FE = 10; private static final int MAX_ENERGY = 1280 * MANA_TO_FE; diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index bfe0123e2..433937b96 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -29,7 +29,7 @@ public final class LibBlockNames { public static final String LIVING_WOOD_FRAMED = "framed_livingwood"; public static final String LIVING_WOOD_PATTERN_FRAMED = "pattern_framed_livingwood"; public static final String LIVING_WOOD_GLIMMERING = "glimmering_livingwood"; - public static final String SPREADER = "spreader"; + public static final String SPREADER = "mana_spreader"; public static final String SPREADER_REDSTONE = "redstone_spreader"; public static final String SPREADER_ELVEN = "elven_spreader"; public static final String SPREADER_GAIA = "gaia_spreader"; @@ -42,7 +42,7 @@ public final class LibBlockNames { public static final String PYLON_NATURA = "natura_pylon"; public static final String PYLON_GAIA = "gaia_pylon"; public static final String PISTON_RELAY = "piston_relay"; - public static final String DISTRIBUTOR = "distributor"; + public static final String DISTRIBUTOR = "mana_distributor"; public static final String MANA_VOID = "mana_void"; public static final String MANA_DETECTOR = "mana_detector"; public static final String ENCHANTER = "enchanter"; @@ -84,7 +84,7 @@ public final class LibBlockNames { public static final String AZULEJO_PREFIX = "azulejo_"; public static final String ENDER_EYE_BLOCK = "ender_eye_block"; public static final String STARFIELD = "starfield"; - public static final String RF_GENERATOR = "rf_generator"; + public static final String FLUXFIELD = "mana_fluxfield"; public static final String ELF_GLASS = "elf_glass"; public static final String BREWERY = "brewery"; public static final String MANA_GLASS = "mana_glass"; diff --git a/src/main/resources/assets/botania/blockstates/alchemy_catalyst.json b/src/main/resources/assets/botania/blockstates/alchemy_catalyst.json index 5ae032154..2b7ea09e4 100644 --- a/src/main/resources/assets/botania/blockstates/alchemy_catalyst.json +++ b/src/main/resources/assets/botania/blockstates/alchemy_catalyst.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/catalyst_alchemy" } + "": { "model": "botania:block/alchemy_catalyst" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/black_pavement.json b/src/main/resources/assets/botania/blockstates/black_pavement.json index 021a9bd96..74e5c6bb1 100644 --- a/src/main/resources/assets/botania/blockstates/black_pavement.json +++ b/src/main/resources/assets/botania/blockstates/black_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/black_pavement" } + "": { "model": "botania:block/black_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/black_pavement_slab.json b/src/main/resources/assets/botania/blockstates/black_pavement_slab.json index 0e36442f4..c087146c5 100644 --- a/src/main/resources/assets/botania/blockstates/black_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/black_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/black_pavement" }, "type=top": { "model": "botania:block/slabs/black_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/black_pavement" } + "type=double": { "model": "botania:block/black_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blue_pavement.json b/src/main/resources/assets/botania/blockstates/blue_pavement.json index d82c425f9..4b1e333d5 100644 --- a/src/main/resources/assets/botania/blockstates/blue_pavement.json +++ b/src/main/resources/assets/botania/blockstates/blue_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/blue_pavement" } + "": { "model": "botania:block/blue_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blue_pavement_slab.json b/src/main/resources/assets/botania/blockstates/blue_pavement_slab.json index 06167f434..bc2791951 100644 --- a/src/main/resources/assets/botania/blockstates/blue_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/blue_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/blue_pavement" }, "type=top": { "model": "botania:block/slabs/blue_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/blue_pavement" } + "type=double": { "model": "botania:block/blue_pavement" } } } diff --git a/src/main/resources/assets/botania/blockstates/conjuration_catalyst.json b/src/main/resources/assets/botania/blockstates/conjuration_catalyst.json index 1238ba408..d356868d2 100644 --- a/src/main/resources/assets/botania/blockstates/conjuration_catalyst.json +++ b/src/main/resources/assets/botania/blockstates/conjuration_catalyst.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/catalyst_conjuration" } + "": { "model": "botania:block/conjuration_catalyst" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/creative_pool.json b/src/main/resources/assets/botania/blockstates/creative_pool.json index 88de273d4..d80ccbff6 100644 --- a/src/main/resources/assets/botania/blockstates/creative_pool.json +++ b/src/main/resources/assets/botania/blockstates/creative_pool.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pool_creative" } + "": { "model": "botania:block/creative_pool" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/diluted_pool.json b/src/main/resources/assets/botania/blockstates/diluted_pool.json index 16be758aa..7f431d68a 100644 --- a/src/main/resources/assets/botania/blockstates/diluted_pool.json +++ b/src/main/resources/assets/botania/blockstates/diluted_pool.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pool_diluted" } + "": { "model": "botania:block/diluted_pool" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elven_spreader.json b/src/main/resources/assets/botania/blockstates/elven_spreader.json index 604b72fb5..a844bb96a 100644 --- a/src/main/resources/assets/botania/blockstates/elven_spreader.json +++ b/src/main/resources/assets/botania/blockstates/elven_spreader.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/spreader_elven" } + "": { "model": "botania:block/elven_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fabulous_pool.json b/src/main/resources/assets/botania/blockstates/fabulous_pool.json index 4d1f81f56..3c71f84ce 100644 --- a/src/main/resources/assets/botania/blockstates/fabulous_pool.json +++ b/src/main/resources/assets/botania/blockstates/fabulous_pool.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pool_fabulous" } + "": { "model": "botania:block/fabulous_pool" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forest_eye.json b/src/main/resources/assets/botania/blockstates/forest_eye.json index 6c89d8c85..b1aecd894 100644 --- a/src/main/resources/assets/botania/blockstates/forest_eye.json +++ b/src/main/resources/assets/botania/blockstates/forest_eye.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/eye_of_ancients" } + "": { "model": "botania:block/forest_eye" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gaia_spreader.json b/src/main/resources/assets/botania/blockstates/gaia_spreader.json index 97d7e6ea0..f7ce65a73 100644 --- a/src/main/resources/assets/botania/blockstates/gaia_spreader.json +++ b/src/main/resources/assets/botania/blockstates/gaia_spreader.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/spreader_gaia" } + "": { "model": "botania:block/gaia_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/green_pavement.json b/src/main/resources/assets/botania/blockstates/green_pavement.json index aed3c0a01..a445eb014 100644 --- a/src/main/resources/assets/botania/blockstates/green_pavement.json +++ b/src/main/resources/assets/botania/blockstates/green_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/green_pavement" } + "": { "model": "botania:block/green_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/green_pavement_slab.json b/src/main/resources/assets/botania/blockstates/green_pavement_slab.json index f20c4c924..e1b4539ad 100644 --- a/src/main/resources/assets/botania/blockstates/green_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/green_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/green_pavement" }, "type=top": { "model": "botania:block/slabs/green_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/green_pavement" } + "type=double": { "model": "botania:block/green_pavement" } } } diff --git a/src/main/resources/assets/botania/blockstates/mana_bomb.json b/src/main/resources/assets/botania/blockstates/mana_bomb.json index 411956d38..a2b7cdbcc 100644 --- a/src/main/resources/assets/botania/blockstates/mana_bomb.json +++ b/src/main/resources/assets/botania/blockstates/mana_bomb.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/manastorm_charge" } + "": { "model": "botania:block/mana_bomb" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/mana_distributor.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/distributor.json rename to src/main/resources/assets/botania/blockstates/mana_distributor.json diff --git a/src/main/resources/assets/botania/blockstates/rf_generator.json b/src/main/resources/assets/botania/blockstates/mana_fluxfield.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/rf_generator.json rename to src/main/resources/assets/botania/blockstates/mana_fluxfield.json diff --git a/src/main/resources/assets/botania/blockstates/mana_pool.json b/src/main/resources/assets/botania/blockstates/mana_pool.json index 2a466078d..3155d0cb1 100644 --- a/src/main/resources/assets/botania/blockstates/mana_pool.json +++ b/src/main/resources/assets/botania/blockstates/mana_pool.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pool_default" } + "": { "model": "botania:block/mana_pool" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mana_spreader.json b/src/main/resources/assets/botania/blockstates/mana_spreader.json index 01326142d..ab567492c 100644 --- a/src/main/resources/assets/botania/blockstates/mana_spreader.json +++ b/src/main/resources/assets/botania/blockstates/mana_spreader.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/spreader_mana" } + "": { "model": "botania:block/mana_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/piston_relay.json b/src/main/resources/assets/botania/blockstates/piston_relay.json index 0789e8e4c..b29d7fffd 100644 --- a/src/main/resources/assets/botania/blockstates/piston_relay.json +++ b/src/main/resources/assets/botania/blockstates/piston_relay.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/force_relay" } + "": { "model": "botania:block/piston_relay" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_pavement.json b/src/main/resources/assets/botania/blockstates/red_pavement.json index 1f44d2ff3..8aeaec670 100644 --- a/src/main/resources/assets/botania/blockstates/red_pavement.json +++ b/src/main/resources/assets/botania/blockstates/red_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/red_pavement" } + "": { "model": "botania:block/red_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_pavement_slab.json b/src/main/resources/assets/botania/blockstates/red_pavement_slab.json index 6d8f83065..89b2dccc7 100644 --- a/src/main/resources/assets/botania/blockstates/red_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/red_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/red_pavement" }, "type=top": { "model": "botania:block/slabs/red_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/red_pavement" } + "type=double": { "model": "botania:block/red_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redstone_spreader.json b/src/main/resources/assets/botania/blockstates/redstone_spreader.json index 182b5e367..12739d7a0 100644 --- a/src/main/resources/assets/botania/blockstates/redstone_spreader.json +++ b/src/main/resources/assets/botania/blockstates/redstone_spreader.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/spreader_redstone" } + "": { "model": "botania:block/redstone_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spark_changer.json b/src/main/resources/assets/botania/blockstates/spark_changer.json index f2150df32..dfdc55425 100644 --- a/src/main/resources/assets/botania/blockstates/spark_changer.json +++ b/src/main/resources/assets/botania/blockstates/spark_changer.json @@ -1,6 +1,5 @@ { "variants": { - "powered=true": { "model": "botania:block/spark_tinkerer" }, - "powered=false": { "model": "botania:block/spark_tinkerer" } + "": { "model": "botania:block/spark_tinkerer" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spawner_claw.json b/src/main/resources/assets/botania/blockstates/spawner_claw.json index 4ffe15eb2..3d3a12c03 100644 --- a/src/main/resources/assets/botania/blockstates/spawner_claw.json +++ b/src/main/resources/assets/botania/blockstates/spawner_claw.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/life_imbuer" } + "": { "model": "botania:block/spawner_claw" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/white_pavement.json b/src/main/resources/assets/botania/blockstates/white_pavement.json index 1cee7b46e..2db02b47e 100644 --- a/src/main/resources/assets/botania/blockstates/white_pavement.json +++ b/src/main/resources/assets/botania/blockstates/white_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/white_pavement" } + "": { "model": "botania:block/white_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/white_pavement_slab.json b/src/main/resources/assets/botania/blockstates/white_pavement_slab.json index e7a536c53..bd810c1fc 100644 --- a/src/main/resources/assets/botania/blockstates/white_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/white_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/white_pavement" }, "type=top": { "model": "botania:block/slabs/white_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/white_pavement" } + "type=double": { "model": "botania:block/white_pavement" } } } diff --git a/src/main/resources/assets/botania/blockstates/yellow_pavement.json b/src/main/resources/assets/botania/blockstates/yellow_pavement.json index 5e0b73c42..739680e99 100644 --- a/src/main/resources/assets/botania/blockstates/yellow_pavement.json +++ b/src/main/resources/assets/botania/blockstates/yellow_pavement.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "botania:block/pavement/yellow_pavement" } + "": { "model": "botania:block/yellow_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/yellow_pavement_slab.json b/src/main/resources/assets/botania/blockstates/yellow_pavement_slab.json index 918f0ffb1..e99571198 100644 --- a/src/main/resources/assets/botania/blockstates/yellow_pavement_slab.json +++ b/src/main/resources/assets/botania/blockstates/yellow_pavement_slab.json @@ -2,6 +2,6 @@ "variants": { "type=bottom": { "model": "botania:block/slabs/yellow_pavement" }, "type=top": { "model": "botania:block/slabs/yellow_pavement", "x": 180, "uvlock": true }, - "type=double": { "model": "botania:block/pavement/yellow_pavement" } + "type=double": { "model": "botania:block/yellow_pavement" } } } diff --git a/src/main/resources/assets/botania/models/block/catalyst_alchemy.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json similarity index 100% rename from src/main/resources/assets/botania/models/block/catalyst_alchemy.json rename to src/main/resources/assets/botania/models/block/alchemy_catalyst.json diff --git a/src/main/resources/assets/botania/models/block/pavement/black_pavement.json b/src/main/resources/assets/botania/models/block/black_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/black_pavement.json rename to src/main/resources/assets/botania/models/block/black_pavement.json diff --git a/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json b/src/main/resources/assets/botania/models/block/blue_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/blue_pavement.json rename to src/main/resources/assets/botania/models/block/blue_pavement.json diff --git a/src/main/resources/assets/botania/models/block/catalyst_conjuration.json b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json similarity index 100% rename from src/main/resources/assets/botania/models/block/catalyst_conjuration.json rename to src/main/resources/assets/botania/models/block/conjuration_catalyst.json diff --git a/src/main/resources/assets/botania/models/block/pool_creative.json b/src/main/resources/assets/botania/models/block/creative_pool.json similarity index 78% rename from src/main/resources/assets/botania/models/block/pool_creative.json rename to src/main/resources/assets/botania/models/block/creative_pool.json index 53fc3058a..1a849e39b 100644 --- a/src/main/resources/assets/botania/models/block/pool_creative.json +++ b/src/main/resources/assets/botania/models/block/creative_pool.json @@ -7,6 +7,6 @@ "predicate": { "botania:full": 1 }, - "model": "botania:block/pool_creative_full" + "model": "botania:block/creative_pool_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_creative_full.json b/src/main/resources/assets/botania/models/block/creative_pool_full.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pool_creative_full.json rename to src/main/resources/assets/botania/models/block/creative_pool_full.json diff --git a/src/main/resources/assets/botania/models/block/pool_diluted.json b/src/main/resources/assets/botania/models/block/diluted_pool.json similarity index 79% rename from src/main/resources/assets/botania/models/block/pool_diluted.json rename to src/main/resources/assets/botania/models/block/diluted_pool.json index d59ec7ffc..fba208832 100644 --- a/src/main/resources/assets/botania/models/block/pool_diluted.json +++ b/src/main/resources/assets/botania/models/block/diluted_pool.json @@ -7,6 +7,6 @@ "predicate": { "botania:full": 1 }, - "model": "botania:block/pool_diluted_full" + "model": "botania:block/diluted_pool_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_diluted_full.json b/src/main/resources/assets/botania/models/block/diluted_pool_full.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pool_diluted_full.json rename to src/main/resources/assets/botania/models/block/diluted_pool_full.json diff --git a/src/main/resources/assets/botania/models/block/spreader_elven.json b/src/main/resources/assets/botania/models/block/elven_spreader.json similarity index 100% rename from src/main/resources/assets/botania/models/block/spreader_elven.json rename to src/main/resources/assets/botania/models/block/elven_spreader.json diff --git a/src/main/resources/assets/botania/models/block/pool_fabulous.json b/src/main/resources/assets/botania/models/block/fabulous_pool.json similarity index 78% rename from src/main/resources/assets/botania/models/block/pool_fabulous.json rename to src/main/resources/assets/botania/models/block/fabulous_pool.json index 79e6422f8..ccce255f8 100644 --- a/src/main/resources/assets/botania/models/block/pool_fabulous.json +++ b/src/main/resources/assets/botania/models/block/fabulous_pool.json @@ -7,6 +7,6 @@ "predicate": { "botania:full": 1 }, - "model": "botania:block/pool_fabulous_full" + "model": "botania:block/fabulous_pool_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_default_full.json b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pool_default_full.json rename to src/main/resources/assets/botania/models/block/fabulous_pool_full.json diff --git a/src/main/resources/assets/botania/models/block/eye_of_ancients.json b/src/main/resources/assets/botania/models/block/forest_eye.json similarity index 100% rename from src/main/resources/assets/botania/models/block/eye_of_ancients.json rename to src/main/resources/assets/botania/models/block/forest_eye.json diff --git a/src/main/resources/assets/botania/models/block/spreader_gaia.json b/src/main/resources/assets/botania/models/block/gaia_spreader.json similarity index 100% rename from src/main/resources/assets/botania/models/block/spreader_gaia.json rename to src/main/resources/assets/botania/models/block/gaia_spreader.json diff --git a/src/main/resources/assets/botania/models/block/pavement/green_pavement.json b/src/main/resources/assets/botania/models/block/green_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/green_pavement.json rename to src/main/resources/assets/botania/models/block/green_pavement.json diff --git a/src/main/resources/assets/botania/models/block/luminizer_launcher.json b/src/main/resources/assets/botania/models/block/light_launcher.json similarity index 100% rename from src/main/resources/assets/botania/models/block/luminizer_launcher.json rename to src/main/resources/assets/botania/models/block/light_launcher.json diff --git a/src/main/resources/assets/botania/models/block/manastorm_charge.json b/src/main/resources/assets/botania/models/block/mana_bomb.json similarity index 100% rename from src/main/resources/assets/botania/models/block/manastorm_charge.json rename to src/main/resources/assets/botania/models/block/mana_bomb.json diff --git a/src/main/resources/assets/botania/models/block/pool_default.json b/src/main/resources/assets/botania/models/block/mana_pool.json similarity index 79% rename from src/main/resources/assets/botania/models/block/pool_default.json rename to src/main/resources/assets/botania/models/block/mana_pool.json index 089b8254d..1256afc80 100644 --- a/src/main/resources/assets/botania/models/block/pool_default.json +++ b/src/main/resources/assets/botania/models/block/mana_pool.json @@ -7,6 +7,6 @@ "predicate": { "botania:full": 1 }, - "model": "botania:block/pool_default_full" + "model": "botania:block/mana_pool_full" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_fabulous_full.json b/src/main/resources/assets/botania/models/block/mana_pool_full.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pool_fabulous_full.json rename to src/main/resources/assets/botania/models/block/mana_pool_full.json diff --git a/src/main/resources/assets/botania/models/block/spreader_mana.json b/src/main/resources/assets/botania/models/block/mana_spreader.json similarity index 100% rename from src/main/resources/assets/botania/models/block/spreader_mana.json rename to src/main/resources/assets/botania/models/block/mana_spreader.json diff --git a/src/main/resources/assets/botania/models/block/force_relay.json b/src/main/resources/assets/botania/models/block/piston_relay.json similarity index 100% rename from src/main/resources/assets/botania/models/block/force_relay.json rename to src/main/resources/assets/botania/models/block/piston_relay.json diff --git a/src/main/resources/assets/botania/models/block/pavement/red_pavement.json b/src/main/resources/assets/botania/models/block/red_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/red_pavement.json rename to src/main/resources/assets/botania/models/block/red_pavement.json diff --git a/src/main/resources/assets/botania/models/block/spreader_redstone.json b/src/main/resources/assets/botania/models/block/redstone_spreader.json similarity index 100% rename from src/main/resources/assets/botania/models/block/spreader_redstone.json rename to src/main/resources/assets/botania/models/block/redstone_spreader.json diff --git a/src/main/resources/assets/botania/models/block/spark_tinkerer.json b/src/main/resources/assets/botania/models/block/spark_changer.json similarity index 100% rename from src/main/resources/assets/botania/models/block/spark_tinkerer.json rename to src/main/resources/assets/botania/models/block/spark_changer.json diff --git a/src/main/resources/assets/botania/models/block/life_imbuer.json b/src/main/resources/assets/botania/models/block/spawner_claw.json similarity index 100% rename from src/main/resources/assets/botania/models/block/life_imbuer.json rename to src/main/resources/assets/botania/models/block/spawner_claw.json diff --git a/src/main/resources/assets/botania/models/block/starfield_creator.json b/src/main/resources/assets/botania/models/block/starfield.json similarity index 100% rename from src/main/resources/assets/botania/models/block/starfield_creator.json rename to src/main/resources/assets/botania/models/block/starfield.json diff --git a/src/main/resources/assets/botania/models/block/pavement/white_pavement.json b/src/main/resources/assets/botania/models/block/white_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/white_pavement.json rename to src/main/resources/assets/botania/models/block/white_pavement.json diff --git a/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json b/src/main/resources/assets/botania/models/block/yellow_pavement.json similarity index 100% rename from src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json rename to src/main/resources/assets/botania/models/block/yellow_pavement.json diff --git a/src/main/resources/assets/botania/models/item/abstruse_platform.json b/src/main/resources/assets/botania/models/item/abstruse_platform.json new file mode 100644 index 000000000..07022013c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/abstruse_platform.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/abstruse_platform" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/alchemy_catalyst.json b/src/main/resources/assets/botania/models/item/alchemy_catalyst.json new file mode 100644 index 000000000..ba8f8dbd8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/alchemy_catalyst.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/alchemy_catalyst" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/alfheim_portal.json b/src/main/resources/assets/botania/models/item/alfheim_portal.json new file mode 100644 index 000000000..bcef690ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/alfheim_portal.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/alfheim_portal" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_default.json b/src/main/resources/assets/botania/models/item/apothecary_default.json new file mode 100644 index 000000000..15c8b35f7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_default.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_default" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_desert.json b/src/main/resources/assets/botania/models/item/apothecary_desert.json new file mode 100644 index 000000000..fb4d8ef77 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_desert.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_desert" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_forest.json b/src/main/resources/assets/botania/models/item/apothecary_forest.json new file mode 100644 index 000000000..2dd7014e2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_forest.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_forest" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_fungal.json b/src/main/resources/assets/botania/models/item/apothecary_fungal.json new file mode 100644 index 000000000..cea22f012 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_fungal.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_fungal" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mesa.json b/src/main/resources/assets/botania/models/item/apothecary_mesa.json new file mode 100644 index 000000000..5e0333809 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_mesa.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_mesa" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mossy.json b/src/main/resources/assets/botania/models/item/apothecary_mossy.json new file mode 100644 index 000000000..892e82638 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_mossy.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_mossy" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_mountain.json b/src/main/resources/assets/botania/models/item/apothecary_mountain.json new file mode 100644 index 000000000..7a745f3dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_mountain.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_mountain" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_plains.json b/src/main/resources/assets/botania/models/item/apothecary_plains.json new file mode 100644 index 000000000..39e5df216 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_plains.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_plains" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_swamp.json b/src/main/resources/assets/botania/models/item/apothecary_swamp.json new file mode 100644 index 000000000..87ea8e155 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_swamp.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_swamp" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/apothecary_taiga.json b/src/main/resources/assets/botania/models/item/apothecary_taiga.json new file mode 100644 index 000000000..40f33053b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/apothecary_taiga.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/apothecary_taiga" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_0.json b/src/main/resources/assets/botania/models/item/azulejo_0.json new file mode 100644 index 000000000..eba584a75 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_0.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_0" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_1.json b/src/main/resources/assets/botania/models/item/azulejo_1.json new file mode 100644 index 000000000..e123a3f8d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_1.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_1" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_10.json b/src/main/resources/assets/botania/models/item/azulejo_10.json new file mode 100644 index 000000000..2a36011f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_10.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_10" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_11.json b/src/main/resources/assets/botania/models/item/azulejo_11.json new file mode 100644 index 000000000..e5b52bfba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_11.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_11" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_12.json b/src/main/resources/assets/botania/models/item/azulejo_12.json new file mode 100644 index 000000000..9972a9579 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_12.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_12" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_13.json b/src/main/resources/assets/botania/models/item/azulejo_13.json new file mode 100644 index 000000000..dbecd2cc2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_13.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_13" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_14.json b/src/main/resources/assets/botania/models/item/azulejo_14.json new file mode 100644 index 000000000..f1f234d88 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_14.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_14" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_15.json b/src/main/resources/assets/botania/models/item/azulejo_15.json new file mode 100644 index 000000000..634ded8da --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_15.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_15" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_2.json b/src/main/resources/assets/botania/models/item/azulejo_2.json new file mode 100644 index 000000000..037f7af77 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_2.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_2" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_3.json b/src/main/resources/assets/botania/models/item/azulejo_3.json new file mode 100644 index 000000000..b4fde5d6e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_3.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_3" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_4.json b/src/main/resources/assets/botania/models/item/azulejo_4.json new file mode 100644 index 000000000..a08c08f28 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_4.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_4" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_5.json b/src/main/resources/assets/botania/models/item/azulejo_5.json new file mode 100644 index 000000000..e68d363d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_5.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_5" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_6.json b/src/main/resources/assets/botania/models/item/azulejo_6.json new file mode 100644 index 000000000..9f06de846 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_6.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_6" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_7.json b/src/main/resources/assets/botania/models/item/azulejo_7.json new file mode 100644 index 000000000..23a78dfeb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_7.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_7" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_8.json b/src/main/resources/assets/botania/models/item/azulejo_8.json new file mode 100644 index 000000000..8f7974d80 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_8.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_8" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/azulejo_9.json b/src/main/resources/assets/botania/models/item/azulejo_9.json new file mode 100644 index 000000000..4f825c23c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/azulejo_9.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/azulejo_9" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bifrost_perm.json b/src/main/resources/assets/botania/models/item/bifrost_perm.json new file mode 100644 index 000000000..b162fa2f5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bifrost_perm.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/bifrost" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_pavement.json b/src/main/resources/assets/botania/models/item/black_pavement.json new file mode 100644 index 000000000..565c34a8c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/black_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/petal.json b/src/main/resources/assets/botania/models/item/black_petal.json similarity index 100% rename from src/main/resources/assets/botania/models/item/petal.json rename to src/main/resources/assets/botania/models/item/black_petal.json diff --git a/src/main/resources/assets/botania/models/item/black_petal_block.json b/src/main/resources/assets/botania/models/item/black_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_block.json b/src/main/resources/assets/botania/models/item/blaze_block.json new file mode 100644 index 000000000..3b087a7b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blaze_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/blaze_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blaze_quartz.json b/src/main/resources/assets/botania/models/item/blaze_quartz.json new file mode 100644 index 000000000..407087056 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blaze_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/blaze_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_pavement.json b/src/main/resources/assets/botania/models/item/blue_pavement.json new file mode 100644 index 000000000..5a09d8f9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/blue_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_petal.json b/src/main/resources/assets/botania/models/item/blue_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_petal_block.json b/src/main/resources/assets/botania/models/item/blue_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_petal.json b/src/main/resources/assets/botania/models/item/brown_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_petal_block.json b/src/main/resources/assets/botania/models/item/brown_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cell_block.json b/src/main/resources/assets/botania/models/item/cell_block.json new file mode 100644 index 000000000..2a3af2729 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cell_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/cell_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cocoon.json b/src/main/resources/assets/botania/models/item/cocoon.json new file mode 100644 index 000000000..b2f44fe7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cocoon.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/cocoon" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/conjuration_catalyst.json b/src/main/resources/assets/botania/models/item/conjuration_catalyst.json new file mode 100644 index 000000000..5f0971a8b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/conjuration_catalyst.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/conjuration_catalyst" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_funnel.json b/src/main/resources/assets/botania/models/item/corporea_funnel.json new file mode 100644 index 000000000..3f3f5facd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporea_funnel.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/corporea_funnel" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_interceptor.json b/src/main/resources/assets/botania/models/item/corporea_interceptor.json new file mode 100644 index 000000000..c83807aeb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporea_interceptor.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/corporea_interceptor" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporea_retainer.json b/src/main/resources/assets/botania/models/item/corporea_retainer.json new file mode 100644 index 000000000..327fae404 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporea_retainer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/corporea_retainer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crafty_crate.json b/src/main/resources/assets/botania/models/item/crafty_crate.json new file mode 100644 index 000000000..543ee0e63 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crafty_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/crafty_crate" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/creative_pool.json b/src/main/resources/assets/botania/models/item/creative_pool.json new file mode 100644 index 000000000..920d226fc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/creative_pool.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/creative_pool" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_petal.json b/src/main/resources/assets/botania/models/item/cyan_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_petal_block.json b/src/main/resources/assets/botania/models/item/cyan_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dark_quartz.json b/src/main/resources/assets/botania/models/item/dark_quartz.json new file mode 100644 index 000000000..4d6dfa302 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dark_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/dark_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/detector_light_relay.json b/src/main/resources/assets/botania/models/item/detector_light_relay.json new file mode 100644 index 000000000..52c428b82 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/detector_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/luminizer_detector" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diluted_pool.json b/src/main/resources/assets/botania/models/item/diluted_pool.json new file mode 100644 index 000000000..1af811eb6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/diluted_pool.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/diluted_pool" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone_block.json b/src/main/resources/assets/botania/models/item/dragonstone_block.json new file mode 100644 index 000000000..dbf2538ce --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/dragonstone_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood.json b/src/main/resources/assets/botania/models/item/dreamwood.json new file mode 100644 index 000000000..3f80b2c01 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwood.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/dreamwood" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/main/resources/assets/botania/models/item/drum_canopy.json new file mode 100644 index 000000000..177319ed6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_canopy.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_canopy" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/main/resources/assets/botania/models/item/drum_gathering.json new file mode 100644 index 000000000..5ecd2593a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_gathering.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_gathering" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/main/resources/assets/botania/models/item/drum_wild.json new file mode 100644 index 000000000..0f9d3c85a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_wild" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dry_grass.json b/src/main/resources/assets/botania/models/item/dry_grass.json new file mode 100644 index 000000000..26f6f9fc3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dry_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/dry_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium_block.json b/src/main/resources/assets/botania/models/item/elementium_block.json new file mode 100644 index 000000000..cc72d139b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/elementium_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium_chest.json b/src/main/resources/assets/botania/models/item/elementium_chestplate.json similarity index 100% rename from src/main/resources/assets/botania/models/item/elementium_chest.json rename to src/main/resources/assets/botania/models/item/elementium_chestplate.json diff --git a/src/main/resources/assets/botania/models/item/elementium_pick.json b/src/main/resources/assets/botania/models/item/elementium_pickaxe.json similarity index 100% rename from src/main/resources/assets/botania/models/item/elementium_pick.json rename to src/main/resources/assets/botania/models/item/elementium_pickaxe.json diff --git a/src/main/resources/assets/botania/models/item/elf_glass.json b/src/main/resources/assets/botania/models/item/elf_glass.json new file mode 100644 index 000000000..b3ef9239f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elf_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/elf_glass_0" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elf_quartz.json b/src/main/resources/assets/botania/models/item/elf_quartz.json new file mode 100644 index 000000000..b18090e00 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elf_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/elf_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elven_spreader.json b/src/main/resources/assets/botania/models/item/elven_spreader.json new file mode 100644 index 000000000..9bc0340b4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elven_spreader.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/elven_spreader" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enchanted_soil.json b/src/main/resources/assets/botania/models/item/enchanted_soil.json new file mode 100644 index 000000000..f59daf58f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enchanted_soil.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/enchanted_soil" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ender_eye_block.json b/src/main/resources/assets/botania/models/item/ender_eye_block.json new file mode 100644 index 000000000..7f87db387 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ender_eye_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/ender_eye_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fabulous_pool.json b/src/main/resources/assets/botania/models/item/fabulous_pool.json new file mode 100644 index 000000000..0ebc10233 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fabulous_pool.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/fabulous_pool" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fel_pumpkin.json b/src/main/resources/assets/botania/models/item/fel_pumpkin.json new file mode 100644 index 000000000..ddc5b84b8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fel_pumpkin.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/fel_pumpkin" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/forest_eye.json b/src/main/resources/assets/botania/models/item/forest_eye.json new file mode 100644 index 000000000..1dce51bc7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/forest_eye.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/forest_eye" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fork_light_relay.json b/src/main/resources/assets/botania/models/item/fork_light_relay.json new file mode 100644 index 000000000..b7aac791a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fork_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/luminizer_fork" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaia_spreader.json b/src/main/resources/assets/botania/models/item/gaia_spreader.json new file mode 100644 index 000000000..9ecb8491e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaia_spreader.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/gaia_spreader" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glass_pick.json b/src/main/resources/assets/botania/models/item/glass_pickaxe.json similarity index 100% rename from src/main/resources/assets/botania/models/item/glass_pick.json rename to src/main/resources/assets/botania/models/item/glass_pickaxe.json diff --git a/src/main/resources/assets/botania/models/item/golden_grass.json b/src/main/resources/assets/botania/models/item/golden_grass.json new file mode 100644 index 000000000..62caf1f78 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/golden_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/golden_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_petal.json b/src/main/resources/assets/botania/models/item/gray_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_petal_block.json b/src/main/resources/assets/botania/models/item/gray_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_pavement.json b/src/main/resources/assets/botania/models/item/green_pavement.json new file mode 100644 index 000000000..20d059256 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/green_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_petal.json b/src/main/resources/assets/botania/models/item/green_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_petal_block.json b/src/main/resources/assets/botania/models/item/green_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hovering_hourglass.json b/src/main/resources/assets/botania/models/item/hourglass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/hovering_hourglass.json rename to src/main/resources/assets/botania/models/item/hourglass.json diff --git a/src/main/resources/assets/botania/models/item/incense_plate.json b/src/main/resources/assets/botania/models/item/incense_plate.json new file mode 100644 index 000000000..a149f2dd1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/incense_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/incense_plate" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infrangible_platform.json b/src/main/resources/assets/botania/models/item/infrangible_platform.json new file mode 100644 index 000000000..9d0d95613 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/infrangible_platform.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/infrangible_platform" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infused_grass.json b/src/main/resources/assets/botania/models/item/infused_grass.json new file mode 100644 index 000000000..6a48255b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/infused_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/infused_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavender_quartz.json b/src/main/resources/assets/botania/models/item/lavender_quartz.json new file mode 100644 index 000000000..3f583498a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lavender_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/lavender_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_petal.json b/src/main/resources/assets/botania/models/item/light_blue_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_petal_block.json b/src/main/resources/assets/botania/models/item/light_blue_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_gray_petal.json b/src/main/resources/assets/botania/models/item/light_gray_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_gray_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_gray_petal_block.json b/src/main/resources/assets/botania/models/item/light_gray_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_gray_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_launcher.json b/src/main/resources/assets/botania/models/item/light_launcher.json new file mode 100644 index 000000000..91106001d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_launcher.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/light_launcher" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_relay.json b/src/main/resources/assets/botania/models/item/light_relay.json new file mode 100644 index 000000000..cf651e56c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/luminizer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_petal.json b/src/main/resources/assets/botania/models/item/lime_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_petal_block.json b/src/main/resources/assets/botania/models/item/lime_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock.json b/src/main/resources/assets/botania/models/item/livingrock.json new file mode 100644 index 000000000..43e2b0562 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/livingrock" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood.json b/src/main/resources/assets/botania/models/item/livingwood.json new file mode 100644 index 000000000..109cd89e8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/livingwood" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_petal.json b/src/main/resources/assets/botania/models/item/magenta_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_petal_block.json b/src/main/resources/assets/botania/models/item/magenta_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_bomb.json b/src/main/resources/assets/botania/models/item/mana_bomb.json new file mode 100644 index 000000000..11a136a75 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_bomb.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_bomb" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_detector.json b/src/main/resources/assets/botania/models/item/mana_detector.json new file mode 100644 index 000000000..f3d2aaefe --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_detector" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_diamond_block.json b/src/main/resources/assets/botania/models/item/mana_diamond_block.json new file mode 100644 index 000000000..309e4cf36 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_diamond_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_diamond_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_distributor.json b/src/main/resources/assets/botania/models/item/mana_distributor.json new file mode 100644 index 000000000..882099de8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_distributor.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_distributor" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_fluxfield.json b/src/main/resources/assets/botania/models/item/mana_fluxfield.json new file mode 100644 index 000000000..c99a9105b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_fluxfield.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_fluxfield" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_glass.json b/src/main/resources/assets/botania/models/item/mana_glass.json new file mode 100644 index 000000000..337796ebd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_pool.json b/src/main/resources/assets/botania/models/item/mana_pool.json new file mode 100644 index 000000000..54347469c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_pool.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_pool" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_quartz.json b/src/main/resources/assets/botania/models/item/mana_quartz.json new file mode 100644 index 000000000..3413d937e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/mana_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_spreader.json b/src/main/resources/assets/botania/models/item/mana_spreader.json new file mode 100644 index 000000000..736de0bce --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_spreader.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_spreader" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_void.json b/src/main/resources/assets/botania/models/item/mana_void.json new file mode 100644 index 000000000..d8695c0af --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_void.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mana_void" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel_block.json b/src/main/resources/assets/botania/models/item/manasteel_block.json new file mode 100644 index 000000000..72d6a2802 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/manasteel_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mutated_grass.json b/src/main/resources/assets/botania/models/item/mutated_grass.json new file mode 100644 index 000000000..64aef3bf6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mutated_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mutated_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/open_crate.json b/src/main/resources/assets/botania/models/item/open_crate.json new file mode 100644 index 000000000..d54fbaf4b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/open_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/open_crate" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_petal.json b/src/main/resources/assets/botania/models/item/orange_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_petal_block.json b/src/main/resources/assets/botania/models/item/orange_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_petal.json b/src/main/resources/assets/botania/models/item/pink_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_petal_block.json b/src/main/resources/assets/botania/models/item/pink_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/piston_relay.json b/src/main/resources/assets/botania/models/item/piston_relay.json new file mode 100644 index 000000000..c9a1b3dcc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/piston_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/piston_relay" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/prism.json b/src/main/resources/assets/botania/models/item/prism.json new file mode 100644 index 000000000..7d4dc00ea --- /dev/null +++ b/src/main/resources/assets/botania/models/item/prism.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/prism" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_petal.json b/src/main/resources/assets/botania/models/item/purple_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_petal_block.json b/src/main/resources/assets/botania/models/item/purple_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_pavement.json b/src/main/resources/assets/botania/models/item/red_pavement.json new file mode 100644 index 000000000..013a31fb5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_petal.json b/src/main/resources/assets/botania/models/item/red_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_petal_block.json b/src/main/resources/assets/botania/models/item/red_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_quartz.json b/src/main/resources/assets/botania/models/item/red_quartz.json new file mode 100644 index 000000000..3e4a96f15 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/red_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_comparator.json b/src/main/resources/assets/botania/models/item/red_string_comparator.json new file mode 100644 index 000000000..8a983846b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_comparator.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_comparator" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_container.json b/src/main/resources/assets/botania/models/item/red_string_container.json new file mode 100644 index 000000000..a932f453f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_container.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_container" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_dispenser.json b/src/main/resources/assets/botania/models/item/red_string_dispenser.json new file mode 100644 index 000000000..394161847 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_dispenser.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_dispenser" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_fertilizer.json b/src/main/resources/assets/botania/models/item/red_string_fertilizer.json new file mode 100644 index 000000000..cd7c520f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_fertilizer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_fertilizer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_interceptor.json b/src/main/resources/assets/botania/models/item/red_string_interceptor.json new file mode 100644 index 000000000..740d59fef --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_interceptor.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_interceptor" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_string_relay.json b/src/main/resources/assets/botania/models/item/red_string_relay.json new file mode 100644 index 000000000..d461d1875 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_string_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/red_string_relay" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstone_spreader.json b/src/main/resources/assets/botania/models/item/redstone_spreader.json new file mode 100644 index 000000000..1af5da70a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redstone_spreader.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/redstone_spreader" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/runic_altar.json b/src/main/resources/assets/botania/models/item/runic_altar.json new file mode 100644 index 000000000..72b86eb1d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/runic_altar.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/runic_altar" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/scorched_grass.json b/src/main/resources/assets/botania/models/item/scorched_grass.json new file mode 100644 index 000000000..28387e912 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/scorched_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/scorched_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerrock.json b/src/main/resources/assets/botania/models/item/shimmerrock.json new file mode 100644 index 000000000..cc694a684 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/shimmerrock.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/shimmerrock" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shimmerwood_planks.json b/src/main/resources/assets/botania/models/item/shimmerwood_planks.json new file mode 100644 index 000000000..ff12b2b24 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/shimmerwood_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/shimmerwood_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spark_changer.json b/src/main/resources/assets/botania/models/item/spark_changer.json new file mode 100644 index 000000000..f9d9b9229 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spark_changer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/spark_changer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawner_claw.json b/src/main/resources/assets/botania/models/item/spawner_claw.json new file mode 100644 index 000000000..387373246 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spawner_claw.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/spawner_claw" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spectral_platform.json b/src/main/resources/assets/botania/models/item/spectral_platform.json new file mode 100644 index 000000000..d19e1abb4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spectral_platform.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/spectral_platform" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starfield.json b/src/main/resources/assets/botania/models/item/starfield.json new file mode 100644 index 000000000..b8103a680 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/starfield.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/starfield" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sunny_quartz.json b/src/main/resources/assets/botania/models/item/sunny_quartz.json new file mode 100644 index 000000000..1ed04b1a7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sunny_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/quartz/sunny_quartz" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terra_plate.json b/src/main/resources/assets/botania/models/item/terra_plate.json new file mode 100644 index 000000000..b66a72f2d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terra_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/terra_plate" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel_block.json b/src/main/resources/assets/botania/models/item/terrasteel_block.json new file mode 100644 index 000000000..f7e9afb63 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/terrasteel_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tiny_planet_block.json b/src/main/resources/assets/botania/models/item/tiny_planet_block.json new file mode 100644 index 000000000..c8a964556 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tiny_planet_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/tiny_planet_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tiny_potato.json b/src/main/resources/assets/botania/models/item/tiny_potato.json new file mode 100644 index 000000000..f839aad9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tiny_potato.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/tiny_potato" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/toggle_light_relay.json b/src/main/resources/assets/botania/models/item/toggle_light_relay.json new file mode 100644 index 000000000..7a4d17bfd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/toggle_light_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:blocks/luminizer_toggle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/turntable.json b/src/main/resources/assets/botania/models/item/turntable.json new file mode 100644 index 000000000..a79a59674 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/turntable.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/turntable" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vivid_grass.json b/src/main/resources/assets/botania/models/item/vivid_grass.json new file mode 100644 index 000000000..5bcedfb38 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vivid_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/vivid_grass" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_pavement.json b/src/main/resources/assets/botania/models/item/white_pavement.json new file mode 100644 index 000000000..71c7a2a46 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/white_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_petal.json b/src/main/resources/assets/botania/models/item/white_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_petal_block.json b/src/main/resources/assets/botania/models/item/white_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_pavement.json b/src/main/resources/assets/botania/models/item/yellow_pavement.json new file mode 100644 index 000000000..22d83cf65 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_pavement.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/yellow_pavement" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_petal.json b/src/main/resources/assets/botania/models/item/yellow_petal.json new file mode 100644 index 000000000..904509bdb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_petal_block.json b/src/main/resources/assets/botania/models/item/yellow_petal_block.json new file mode 100644 index 000000000..cd679de07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file