mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-22 13:09:42 +00:00
More borign model cleaning
This commit is contained in:
83 files changed
+349
-375
No files matched your search
@@ -8,20 +8,15 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDoublePlant;
|
||||
import net.minecraft.block.BlockFlower;
|
||||
import net.minecraft.block.BlockSkull;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.BlockWall;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.block.statemap.StateMap;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.obj.OBJLoader;
|
||||
@@ -48,7 +43,6 @@ import vazkii.botania.client.model.SpecialFlowerModel;
|
||||
import vazkii.botania.client.render.IModelRegister;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
|
||||
import vazkii.botania.common.block.subtile.SubTileDecor;
|
||||
import vazkii.botania.common.block.subtile.SubTileManastar;
|
||||
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
|
||||
@@ -92,26 +86,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
|
||||
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
|
||||
import vazkii.botania.common.block.tile.TileAvatar;
|
||||
import vazkii.botania.common.block.tile.TileBrewery;
|
||||
import vazkii.botania.common.block.tile.TileGaiaHead;
|
||||
import vazkii.botania.common.block.tile.TileHourglass;
|
||||
import vazkii.botania.common.block.tile.TileTeruTeruBozu;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
|
||||
import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.function.IntFunction;
|
||||
|
||||
import static vazkii.botania.common.item.ModItems.*;
|
||||
|
||||
public final class ModelHandler {
|
||||
|
||||
public static void registerModels() {
|
||||
@@ -209,79 +189,79 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
private static void registerStandardBlocks() {
|
||||
registerBlockStandardPath(ModBlocks.avatar);
|
||||
registerBlockStandardPath(ModBlocks.bellows);
|
||||
registerBlockStandardPath(ModBlocks.brewery);
|
||||
registerBlockStandardPath(ModBlocks.corporeaCrystalCube);
|
||||
registerBlockStandardPath(ModBlocks.corporeaIndex);
|
||||
registerBlockStandardPath(ModBlocks.hourglass);
|
||||
registerBlockStandardPath(ModBlocks.teruTeruBozu);
|
||||
registerBlockCustomPath(ModBlocks.avatar, "avatar");
|
||||
registerBlockCustomPath(ModBlocks.bellows, "bellows");
|
||||
registerBlockCustomPath(ModBlocks.brewery, "brewery");
|
||||
registerBlockVariantInventory(ModBlocks.corporeaCrystalCube);
|
||||
registerBlockCustomPath(ModBlocks.corporeaIndex, "corporea_index");
|
||||
registerBlockCustomPath(ModBlocks.hourglass, "hovering_hourglass");
|
||||
registerBlockCustomPath(ModBlocks.teruTeruBozu, "teru_teru_bozu");
|
||||
|
||||
registerBlockStandardPath(ModBlocks.alchemyCatalyst);
|
||||
registerBlockStandardPath(ModBlocks.alfPortal);
|
||||
registerBlockVariantNormal(ModBlocks.alchemyCatalyst);
|
||||
registerBlockVariant(ModBlocks.alfPortal, "state=off");
|
||||
registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane");
|
||||
registerBlockStandardPath(ModBlocks.bifrost);
|
||||
registerBlockVariantNormal(ModBlocks.bifrost);
|
||||
registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane");
|
||||
registerBlockStandardPath(ModBlocks.bifrostPerm);
|
||||
registerBlockVariantNormal(ModBlocks.bifrostPerm);
|
||||
registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall");
|
||||
registerBlockStandardPath(ModBlocks.blazeBlock);
|
||||
registerBlockStandardPath(ModBlocks.cacophonium);
|
||||
registerBlockStandardPath(ModBlocks.cellBlock);
|
||||
registerBlockStandardPath(ModBlocks.conjurationCatalyst);
|
||||
registerBlockStandardPath(ModBlocks.cocoon);
|
||||
registerBlockStandardPath(ModBlocks.corporeaFunnel);
|
||||
registerBlockStandardPath(ModBlocks.corporeaInterceptor);
|
||||
registerBlockStandardPath(ModBlocks.corporeaRetainer);
|
||||
registerBlockVariant(ModBlocks.dirtPath);
|
||||
registerBlockVariantNormal(ModBlocks.blazeBlock);
|
||||
registerBlockVariant(ModBlocks.cacophonium, "powered=false");
|
||||
registerBlockVariantNormal(ModBlocks.cellBlock);
|
||||
registerBlockVariantNormal(ModBlocks.conjurationCatalyst);
|
||||
registerBlockVariantNormal(ModBlocks.cocoon);
|
||||
registerBlockVariant(ModBlocks.corporeaFunnel, "powered=false");
|
||||
registerBlockVariant(ModBlocks.corporeaInterceptor, "powered=false");
|
||||
registerBlockVariant(ModBlocks.corporeaRetainer, "powered=false");
|
||||
registerBlockVariantNormal(ModBlocks.dirtPath);
|
||||
registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName());
|
||||
registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName());
|
||||
registerBlockStandardPath(ModBlocks.distributor);
|
||||
registerBlockVariantNormal(ModBlocks.distributor);
|
||||
registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall");
|
||||
registerBlockStandardPath(ModBlocks.elfGlass);
|
||||
registerBlockStandardPath(ModBlocks.enchantedSoil);
|
||||
registerBlockStandardPath(ModBlocks.enchanter);
|
||||
registerBlockStandardPath(ModBlocks.enderEye);
|
||||
registerBlockStandardPath(ModBlocks.felPumpkin);
|
||||
registerBlockStandardPath(ModBlocks.floatingSpecialFlower);
|
||||
registerBlockVariantNormal(ModBlocks.elfGlass);
|
||||
registerBlockVariantNormal(ModBlocks.enchantedSoil);
|
||||
registerBlockVariant(ModBlocks.enchanter, "facing=x");
|
||||
registerBlockVariant(ModBlocks.enderEye, "powered=false");
|
||||
registerBlockVariant(ModBlocks.felPumpkin, "facing=north");
|
||||
registerBlockVariantInventory(ModBlocks.floatingSpecialFlower);
|
||||
registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName());
|
||||
registerBlockVariant(ModBlocks.forestEye);
|
||||
registerBlockStandardPath(ModBlocks.ghostRail);
|
||||
registerBlockStandardPath(ModBlocks.incensePlate);
|
||||
registerBlockVariantNormal(ModBlocks.forestEye);
|
||||
registerBlockCustomPath(ModBlocks.ghostRail, "ghost_rail");
|
||||
registerBlockVariant(ModBlocks.incensePlate, "facing=south");
|
||||
registerBlockVariant(ModBlocks.lightLauncher, "powered=false");
|
||||
registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall");
|
||||
registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall");
|
||||
registerBlockStandardPath(ModBlocks.manaBomb);
|
||||
registerBlockStandardPath(ModBlocks.manaDetector);
|
||||
registerBlockStandardPath(ModBlocks.manaGlass);
|
||||
registerBlockVariantNormal(ModBlocks.manaBomb);
|
||||
registerBlockVariant(ModBlocks.manaDetector, "powered=false");
|
||||
registerBlockVariantNormal(ModBlocks.manaGlass);
|
||||
registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane");
|
||||
registerBlockStandardPath(ModBlocks.manaVoid);
|
||||
registerBlockVariantNormal(ModBlocks.manaVoid);
|
||||
registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName());
|
||||
// Explicit mapping needed because saved meta does not match EnumDyeColor
|
||||
EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN };
|
||||
registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName());
|
||||
registerBlockStandardPath(ModBlocks.prism);
|
||||
registerBlockStandardPath(ModBlocks.pistonRelay);
|
||||
registerBlockStandardPath(ModBlocks.pump);
|
||||
registerBlockStandardPath(ModBlocks.redStringComparator);
|
||||
registerBlockStandardPath(ModBlocks.redStringContainer);
|
||||
registerBlockStandardPath(ModBlocks.redStringDispenser);
|
||||
registerBlockStandardPath(ModBlocks.redStringFertilizer);
|
||||
registerBlockStandardPath(ModBlocks.redStringInterceptor);
|
||||
registerBlockStandardPath(ModBlocks.redStringRelay);
|
||||
registerBlockStandardPath(ModBlocks.rfGenerator);
|
||||
registerBlockStandardPath(ModBlocks.root);
|
||||
registerBlockVariant(ModBlocks.runeAltar);
|
||||
registerBlockStandardPath(ModBlocks.shimmerrock);
|
||||
registerBlockStandardPath(ModBlocks.shimmerwoodPlanks);
|
||||
registerBlockVariant(ModBlocks.prism, "has_lens=false,powered=false");
|
||||
registerBlockVariantNormal(ModBlocks.pistonRelay);
|
||||
registerBlockVariantInventory(ModBlocks.pump);
|
||||
registerBlockVariant(ModBlocks.redStringComparator, "facing=north");
|
||||
registerBlockVariant(ModBlocks.redStringContainer, "facing=north");
|
||||
registerBlockVariant(ModBlocks.redStringDispenser, "facing=north,powered=false");
|
||||
registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north");
|
||||
registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north,powered=false");
|
||||
registerBlockVariant(ModBlocks.redStringRelay, "facing=north");
|
||||
registerBlockVariantNormal(ModBlocks.rfGenerator);
|
||||
registerBlockVariantNormal(ModBlocks.root);
|
||||
registerBlockVariantNormal(ModBlocks.runeAltar);
|
||||
registerBlockVariantNormal(ModBlocks.shimmerrock);
|
||||
registerBlockVariantNormal(ModBlocks.shimmerwoodPlanks);
|
||||
registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName());
|
||||
registerBlockVariant(ModBlocks.sparkChanger, "powered=false");
|
||||
registerBlockVariant(ModBlocks.spawnerClaw);
|
||||
registerBlockStandardPath(ModBlocks.specialFlower);
|
||||
registerBlockVariantNormal(ModBlocks.spawnerClaw);
|
||||
registerBlockVariantInventory(ModBlocks.specialFlower);
|
||||
registerBlockVariant(ModBlocks.starfield, "powered=false");
|
||||
registerBlockVariant(ModBlocks.terraPlate);
|
||||
registerBlockVariant(ModBlocks.tinyPlanet);
|
||||
registerBlockVariantNormal(ModBlocks.terraPlate);
|
||||
registerBlockVariantNormal(ModBlocks.tinyPlanet);
|
||||
registerBlockVariant(ModBlocks.tinyPotato, "facing=north");
|
||||
registerBlockStandardPath(ModBlocks.turntable);
|
||||
registerBlockVariantNormal(ModBlocks.turntable);
|
||||
|
||||
// Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons
|
||||
registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length);
|
||||
@@ -371,10 +351,15 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
// -- Registers the ItemBlock model to be the Block's model, of the specified variant -- //
|
||||
private static void registerBlockVariant(Block b) {
|
||||
private static void registerBlockVariantNormal(Block b) {
|
||||
registerBlockVariant(b, "normal");
|
||||
}
|
||||
|
||||
// Registers the ItemBlock to models/item/<registryname>#inventory
|
||||
private static void registerBlockVariantInventory(Block b) {
|
||||
registerBlockVariant(b, "inventory");
|
||||
}
|
||||
|
||||
public static void registerBlockVariant(Block b, String variant) {
|
||||
registerBlockVariantMetas(b, 1, variant);
|
||||
}
|
||||
@@ -393,11 +378,6 @@ public final class ModelHandler {
|
||||
}
|
||||
}
|
||||
|
||||
// Registers the ItemBlock to models/item/<registryname>#inventory
|
||||
private static void registerBlockStandardPath(Block b) {
|
||||
registerBlockVariant(b, "inventory");
|
||||
}
|
||||
|
||||
// Registers the ItemBlock to a custom path in models/item/itemblock/
|
||||
private static void registerBlockCustomPath(Block b, String path) {
|
||||
registerBlockCustomPathMetas(b, 1, path);
|
||||
|
||||
@@ -1,17 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "botania:blocks/alchemyCatalyst0",
|
||||
"top": "botania:blocks/alchemyCatalyst1",
|
||||
"side": "botania:blocks/alchemyCatalyst2"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:alchemy_catalyst" }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,22 +1,7 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/alfheimPortal0"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"state": {
|
||||
"off": {},
|
||||
"on_x": {
|
||||
"textures": { "all": "botania:blocks/alfheimPortal1" }
|
||||
},
|
||||
"on_z": {
|
||||
"textures": { "all": "botania:blocks/alfheimPortal1" }
|
||||
}
|
||||
},
|
||||
"inventory": [{}]
|
||||
"state=off": { "model": "botania:alfheim_portal" },
|
||||
"state=on_x": { "model": "botania:alfheim_portal_on" },
|
||||
"state=on_z": { "model": "botania:alfheim_portal_on" }
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,40 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": { "bottom": "minecraft:blocks/dirt" },
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"variant": {
|
||||
"dry": {
|
||||
"textures": { "top": "botania:blocks/altGrass0", "side": "botania:blocks/altGrass1" }
|
||||
},
|
||||
"golden": {
|
||||
"textures": { "top": "botania:blocks/altGrass2", "side": "botania:blocks/altGrass3" }
|
||||
},
|
||||
"vivid": {
|
||||
"textures": { "top": "botania:blocks/altGrass4", "side": "botania:blocks/altGrass5" }
|
||||
},
|
||||
"scorched": {
|
||||
"textures": { "top": "botania:blocks/altGrass6", "side": "botania:blocks/altGrass7" }
|
||||
},
|
||||
"infused": {
|
||||
"textures": { "top": "botania:blocks/altGrass8", "side": "botania:blocks/altGrass9" }
|
||||
},
|
||||
"mutated": {
|
||||
"textures": { "top": "botania:blocks/altGrass10", "side": "botania:blocks/altGrass11" }
|
||||
}
|
||||
}
|
||||
"variant=dry": [
|
||||
{ "model": "botania:dry_grass" },
|
||||
{ "model": "botania:dry_grass", "y": 90 },
|
||||
{ "model": "botania:dry_grass", "y": 180 },
|
||||
{ "model": "botania:dry_grass", "y": 270 }
|
||||
],
|
||||
"variant=golden": [
|
||||
{ "model": "botania:golden_grass" },
|
||||
{ "model": "botania:golden_grass", "y": 90 },
|
||||
{ "model": "botania:golden_grass", "y": 180 },
|
||||
{ "model": "botania:golden_grass", "y": 270 }
|
||||
],
|
||||
"variant=vivid": [
|
||||
{ "model": "botania:vivid_grass" },
|
||||
{ "model": "botania:vivid_grass", "y": 90 },
|
||||
{ "model": "botania:vivid_grass", "y": 180 },
|
||||
{ "model": "botania:vivid_grass", "y": 270 }
|
||||
],
|
||||
"variant=scorched": [
|
||||
{ "model": "botania:scorched_grass" },
|
||||
{ "model": "botania:scorched_grass", "y": 90 },
|
||||
{ "model": "botania:scorched_grass", "y": 180 },
|
||||
{ "model": "botania:scorched_grass", "y": 270 }
|
||||
],
|
||||
"variant=infused": [
|
||||
{ "model": "botania:infused_grass" },
|
||||
{ "model": "botania:infused_grass", "y": 90 },
|
||||
{ "model": "botania:infused_grass", "y": 180 },
|
||||
{ "model": "botania:infused_grass", "y": 270 }
|
||||
],
|
||||
"variant=mutated": [
|
||||
{ "model": "botania:mutated_grass" },
|
||||
{ "model": "botania:mutated_grass", "y": 90 },
|
||||
{ "model": "botania:mutated_grass", "y": 180 },
|
||||
{ "model": "botania:mutated_grass", "y": 270 }
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1,15 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/bifrost"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:bifrost" }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,15 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/bifrost"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:bifrost" }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,14 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/blazeBlock"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:blaze_block" }
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -10,8 +10,7 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
|
||||
}
|
||||
@@ -13,7 +13,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,10 @@
|
||||
"top": "botania:blocks/distributor0",
|
||||
"side": "botania:blocks/distributor1",
|
||||
"bottom": "botania:blocks/livingrock0"
|
||||
}
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{
|
||||
"transform": "forge:default-block"
|
||||
}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all"
|
||||
"model": "minecraft:cube_all",
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [
|
||||
@@ -9,10 +10,6 @@
|
||||
{ "textures": { "all": "botania:blocks/elfGlass1" } },
|
||||
{ "textures": { "all": "botania:blocks/elfGlass2" } },
|
||||
{ "textures": { "all": "botania:blocks/elfGlass3" } }
|
||||
],
|
||||
"inventory": [{
|
||||
"transform": "forge:default-block",
|
||||
"textures": { "all": "botania:blocks/elfGlass" }
|
||||
}]
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@
|
||||
"facing": {
|
||||
"x": {},
|
||||
"z": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@
|
||||
"true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } },
|
||||
"false": {}
|
||||
},
|
||||
"powered=false": [{}],
|
||||
"inventory": [{}]
|
||||
"powered=false": [{}]
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,8 @@
|
||||
"top": "minecraft:blocks/pumpkin_top",
|
||||
"front": "botania:blocks/felPumpkin",
|
||||
"side": "minecraft:blocks/pumpkin_side"
|
||||
}
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"facing": {
|
||||
@@ -14,9 +15,6 @@
|
||||
"south": { "y": 180 },
|
||||
"west": { "y": 270 },
|
||||
"east": { "y": 90 }
|
||||
},
|
||||
"inventory": [{
|
||||
"transform": "forge:default-block"
|
||||
}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,7 @@
|
||||
"defaults": {
|
||||
"textures": {
|
||||
"rail": "botania:blocks/ghostRail"
|
||||
},
|
||||
"transform": "forge:default-item"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"shape": {
|
||||
@@ -14,12 +13,6 @@
|
||||
"ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 },
|
||||
"ascending_north": { "model": "minecraft:rail_raised_ne" },
|
||||
"ascending_south": { "model": "minecraft:rail_raised_sw" }
|
||||
},
|
||||
"inventory": [{
|
||||
"model": "builtin/generated",
|
||||
"textures": {
|
||||
"layer0": "botania:blocks/ghostRail"
|
||||
}
|
||||
}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@
|
||||
"south": {},
|
||||
"west": { "y": 90 },
|
||||
"east": { "y": 270 }
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,9 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"variant": {
|
||||
"default": { "textures": { "all": "botania:blocks/livingrock0" } },
|
||||
"brick": { "textures": { "all": "botania:blocks/livingrock1" } },
|
||||
"mossy_brick": { "textures": { "all": "botania:blocks/livingrock2" } },
|
||||
"cracked_brick": { "textures": { "all": "botania:blocks/livingrock3" } },
|
||||
"chiseled_brick": { "textures": { "all": "botania:blocks/livingrock4" } }
|
||||
}
|
||||
"variant=default": { "model": "botania:livingrock" },
|
||||
"variant=brick": { "model": "botania:livingrock_brick" },
|
||||
"variant=mossy_brick": { "model": "botania:livingrock_mossy_brick" },
|
||||
"variant=cracked_brick": { "model": "botania:livingrock_cracked_brick" },
|
||||
"variant=chiseled_brick": { "model": "botania:livingrock_chiseled_brick" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/livingrock0" }
|
||||
}]
|
||||
"normal": { "model": "botania:livingrock" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/livingrock1" }
|
||||
}]
|
||||
"normal": { "model": "botania:livingrock_brick" }
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,10 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"variant": {
|
||||
"default": { "textures": { "all": "botania:blocks/livingwood0" } },
|
||||
"planks": { "textures": { "all": "botania:blocks/livingwood1" } },
|
||||
"mossy_planks": { "textures": { "all": "botania:blocks/livingwood2" } },
|
||||
"framed": { "textures": { "all": "botania:blocks/livingwood3" } },
|
||||
"pattern_framed": { "textures": { "all": "botania:blocks/livingwood4" } },
|
||||
"glimmering": { "textures": { "all": "botania:blocks/livingwood5" } }
|
||||
}
|
||||
"variant=default": { "model": "botania:livingwood" },
|
||||
"variant=planks": { "model": "botania:livingwood_planks" },
|
||||
"variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" },
|
||||
"variant=framed": { "model": "botania:livingwood_framed" },
|
||||
"variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" },
|
||||
"variant=glimmering": { "model": "botania:livingwood_glimmering" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/livingwood0" }
|
||||
}]
|
||||
"normal": { "model": "botania:livingwood" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/livingwood1" }
|
||||
}]
|
||||
"normal": { "model": "botania:livingwood_planks" }
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@
|
||||
"powered": {
|
||||
"true": { "textures": { "all": "botania:blocks/manaDetector1" } },
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,12 +4,10 @@
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/manaGlass"
|
||||
}
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{
|
||||
"transform": "forge:default-block"
|
||||
}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -8,8 +8,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,12 +4,10 @@
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/pistonRelay"
|
||||
}
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{
|
||||
"transform": "forge:default-block"
|
||||
}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -1,23 +1,8 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:prism",
|
||||
"textures": {
|
||||
"bottom": "botania:blocks/prism0",
|
||||
"top": "botania:blocks/prism0",
|
||||
"side": "botania:blocks/prism1"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"inventory": [{}],
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"has_lens": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
}
|
||||
"has_lens=false,powered=false": { "model": "botania:prism" },
|
||||
"has_lens=true,powered=false": { "model": "botania:prism" },
|
||||
"has_lens=false,powered=true": { "model": "botania:prism" },
|
||||
"has_lens=true,powered=true": { "model": "botania:prism" }
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,6 @@
|
||||
"east": { "y": 90 },
|
||||
"down": { "x": 90 },
|
||||
"up": { "x": 270 }
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,6 @@
|
||||
"east": { "y": 90 },
|
||||
"down": { "x": 90 },
|
||||
"up": { "x": 270 }
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,6 @@
|
||||
"east": { "y": 90 },
|
||||
"down": { "x": 90 },
|
||||
"up": { "x": 270 }
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,6 @@
|
||||
"powered": {
|
||||
"true": {},
|
||||
"false": {}
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,6 @@
|
||||
"east": { "y": 90 },
|
||||
"down": { "x": 90 },
|
||||
"up": { "x": 270 }
|
||||
},
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,6 @@
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": [{}]
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/root"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}]
|
||||
"normal": { "model": "botania:root" }
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/seaLamp"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/shimmerrock" },
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:shimmerrock" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/shimmerrock" }
|
||||
}]
|
||||
"normal": { "model": "botania:shimmerrock" }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/shimmerwoodPlanks" },
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:shimmerwood_planks" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"normal": [{
|
||||
"model": "minecraft:cube_all",
|
||||
"textures": { "all": "botania:blocks/shimmerwoodPlanks" }
|
||||
}]
|
||||
"normal": { "model": "botania:shimmerwood_planks" }
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"normal": {
|
||||
"model": "botania:life_imbuer"
|
||||
}
|
||||
"normal": { "model": "botania:life_imbuer" }
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "botania:blocks/turntable1",
|
||||
"top": "botania:blocks/turntable0",
|
||||
"side": "botania:blocks/turntable1"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
"normal": { "model": "botania:turntable" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "botania:blocks/alchemyCatalyst0",
|
||||
"top": "botania:blocks/alchemyCatalyst1",
|
||||
"side": "botania:blocks/alchemyCatalyst2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/alfheimPortal0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/alfheimPortal1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/bifrost"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/blazeBlock"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass0",
|
||||
"side": "botania:blocks/altGrass1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass2",
|
||||
"side": "botania:blocks/altGrass3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass8",
|
||||
"side": "botania:blocks/altGrass9"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingrock0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingrock1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingrock4"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingrock3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingrock2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood5"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood4"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/livingwood1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass10",
|
||||
"side": "botania:blocks/altGrass11"
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,10 @@
|
||||
{
|
||||
"parent": "minecraft:block/block",
|
||||
"textures": {
|
||||
"particle": "#side"
|
||||
"bottom": "botania:blocks/prism0",
|
||||
"top": "botania:blocks/prism0",
|
||||
"side": "botania:blocks/prism1",
|
||||
"particle": "botania:blocks/prism1"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/root"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass6",
|
||||
"side": "botania:blocks/altGrass7"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/shimmerrock"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "botania:blocks/shimmerwoodPlanks"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "botania:blocks/turntable1",
|
||||
"top": "botania:blocks/turntable0",
|
||||
"side": "botania:blocks/turntable1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"top": "botania:blocks/altGrass4",
|
||||
"side": "botania:blocks/altGrass5"
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "botania:blocks/ghostRail"
|
||||
}
|
||||
}
|
||||
File renamed without changes.
Reference in new issue
Block a user