diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 9f91c8f3a..1691f19f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -37,6 +37,7 @@ import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; @@ -128,6 +129,7 @@ public final class ModelHandler { registerPanes(); registerAltars(); registerQuartzBlocks(); + registerLuminizers(); /** Normal Items **/ registerStandardItems(); @@ -308,6 +310,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.floatingSpecialFlower); registerItemModel(ModBlocks.sparkChanger); registerItemModel(ModBlocks.terraPlate); + registerItemModel(ModBlocks.corporeaRetainer); + registerItemModel(ModBlocks.corporeaInterceptor); + registerItemModel(ModBlocks.corporeaFunnel); + registerItemModel(ModBlocks.lightLauncher); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); @@ -551,9 +557,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - // Ignore redstone power state in some blocks - ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); - // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); @@ -849,6 +852,15 @@ public final class ModelHandler { } } + private static void registerLuminizers() { + Item item = Item.getItemFromBlock(ModBlocks.lightRelay); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); + for (LuminizerVariant v : LuminizerVariant.values()) { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); + ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java index 277bd5806..2265a28c8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei; import org.lwjgl.input.Keyboard; @@ -60,3 +61,4 @@ public class NEIBotaniaConfig implements IConfigureNEI { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java index 37953eeaf..3d23c8b5f 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Dec 15, 2014, 6:09:38 PM (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; @@ -22,3 +23,4 @@ public class NEIGuiHooks { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java index e1ea06188..02db53a2f 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [25/12/2015, 02:22:32 (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei; import vazkii.botania.api.corporea.CorporeaHelper; @@ -101,3 +102,4 @@ public class NEIInputHandler implements IContainerInputHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java index f0b7bfe78..538be3b66 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -138,3 +139,4 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 2ab363bef..c6cb4b0c5 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -98,7 +99,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } private static boolean hasElvenKnowledge() { - /*EntityPlayer player = Minecraft.getMinecraft().thePlayer; + */ +/*EntityPlayer player = Minecraft.getMinecraft().thePlayer; if (player != null) { for (ItemStack stack : player.inventory.mainInventory) { if (stack != null && stack.getItem() instanceof ILexicon) { @@ -109,7 +111,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } } - return false;*/ + return false;*//* + return true; } @@ -166,3 +169,4 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java index d1a1f397a..d70ecdb18 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -79,3 +80,4 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index ea1933074..757048ba6 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [12/12/2015, 23:25:47 (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -169,3 +170,4 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 124737484..76db6ea0a 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -155,3 +156,4 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java index 0ab15efba..0b0226079 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -141,3 +142,4 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java index b6953b39f..ccfa58439 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -136,3 +137,4 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java index 506ad540d..ca9aeabd8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.util.List; @@ -55,3 +56,4 @@ public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary { } } +*/ diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 144684c96..d45842da2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -138,7 +138,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { - return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT + return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR && state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -154,7 +154,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getRenderType() { - return LibRenderIDs.idLightRelay; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 6b5964580..df317dcc2 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -68,7 +68,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @Override public int getRenderType() { - return LibRenderIDs.idCorporeaCrystalCybe; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 6161a812e..eb0a8e644 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -44,7 +44,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @Override public int getRenderType() { - return LibRenderIDs.idCorporeaIndex; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index b3f613970..7af25e51d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -48,11 +48,6 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, int manaLastTick = 0; public int signal = 0; - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } - public boolean addItem(EntityPlayer player, ItemStack stack) { if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 752394c91..149689951 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -10,14 +10,24 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; public class TileMod extends TileEntity { + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + // todo: review all subclasses. this could potentially leave stragglers hanging. + // todo: example: open crate and crafty crate should refresh when variants change + return oldState.getBlock() != newState.getBlock(); + } + @Override public void writeToNBT(NBTTagCompound par1nbtTagCompound) { super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 726aa111e..bf25397fe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -44,11 +44,6 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public String subTileName = ""; SubTileEntity subTile; - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } - @Override public SubTileEntity getSubTile() { return subTile; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index d10cbe68c..d7fc212ab 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -35,7 +35,7 @@ public class TileCorporeaRetainer extends TileMod { private static final int REQUEST_STRING = 2; boolean pendingRequest = false; - BlockPos requestPos; + BlockPos requestPos = BlockPos.ORIGIN; Object request; int requestCount; diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java index 3592e0d50..b41f47b3d 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)] - */ + *//* + package vazkii.botania.common.integration.multipart; import java.util.ArrayList; @@ -70,4 +71,4 @@ public class MultipartHandler { MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); } -} \ No newline at end of file +}*/ diff --git a/src/main/resources/assets/botania/blockstates/buriedPetals.json b/src/main/resources/assets/botania/blockstates/buriedPetals.json new file mode 100644 index 000000000..52b77d221 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/buriedPetals.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy" + }, + "variants": { + "color": { + "white": { "textures": { "particle": "minecraft:blocks/wool_colored_white" }}, + "orange": { "textures": { "particle": "minecraft:blocks/wool_colored_orange" }}, + "magenta": { "textures": { "particle": "minecraft:blocks/wool_colored_magenta" }}, + "light_blue": { "textures": { "particle": "minecraft:blocks/wool_colored_light_blue" }}, + "yellow": { "textures": { "particle": "minecraft:blocks/wool_colored_yellow" }}, + "lime": { "textures": { "particle": "minecraft:blocks/wool_colored_lime" }}, + "pink": { "textures": { "particle": "minecraft:blocks/wool_colored_pink" }}, + "gray": { "textures": { "particle": "minecraft:blocks/wool_colored_gray" }}, + "silver": { "textures": { "particle": "minecraft:blocks/wool_colored_silver" }}, + "cyan": { "textures": { "particle": "minecraft:blocks/wool_colored_cyan" }}, + "purple": { "textures": { "particle": "minecraft:blocks/wool_colored_purple" }}, + "blue": { "textures": { "particle": "minecraft:blocks/wool_colored_blue" }}, + "brown": { "textures": { "particle": "minecraft:blocks/wool_colored_brown" }}, + "green": { "textures": { "particle": "minecraft:blocks/wool_colored_green" }}, + "red": { "textures": { "particle": "minecraft:blocks/wool_colored_red" }}, + "black": { "textures": { "particle": "minecraft:blocks/wool_colored_black" }} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json new file mode 100644 index 000000000..ba2242e45 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaFunnel0", + "top": "botania:blocks/corporeaFunnel0", + "side": "botania:blocks/corporeaFunnel1" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json new file mode 100644 index 000000000..9e4db20af --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaInterceptor0", + "top": "botania:blocks/corporeaInterceptor0", + "side": "botania:blocks/corporeaInterceptor1" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json new file mode 100644 index 000000000..de67279d8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/corporeaRetainer" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightLauncher.json b/src/main/resources/assets/botania/blockstates/lightLauncher.json new file mode 100644 index 000000000..96cde7753 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lightLauncher.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:fourhigh", + "textures": { + "bottom": "botania:blocks/lightLauncher", + "top": "botania:blocks/lightLauncher", + "side": "botania:blocks/lightLauncher" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightRelay.json b/src/main/resources/assets/botania/blockstates/lightRelay.json new file mode 100644 index 000000000..6b9542b00 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lightRelay.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "variant": { + "default": { + "textures": { + "layer0": "botania:blocks/lightRelay0", + "particle": "botania:blocks/lightRelay1" + } + }, + "detector": { + "textures": { + "layer0": "botania:blocks/lightRelay2", + "particle": "botania:blocks/lightRelay3" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index 23adc2498..aaf085ab4 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -1,19 +1,20 @@ { "forge_marker": 1, "defaults": { + "model": "botania:fourhigh", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + }, "transform": "forge:default-block" }, "variants": { - "normal": [{ - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield1", - "side": "botania:blocks/starfield2" - } - }], + "powered": { + "true": {}, + "false": {} + }, "inventory": [{ - "model": "botania:fourhigh", "textures": { "bottom": "botania:blocks/starfield0", "top": "botania:blocks/starfield0", diff --git a/src/main/resources/assets/botania/models/block/dummy.json b/src/main/resources/assets/botania/models/block/dummy.json new file mode 100644 index 000000000..2a4f56dc6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dummy.json @@ -0,0 +1,12 @@ +{ + "__comment": "Dummy for TESRS that still want to set their block break particle without using code", + "elements": [ + { + "from": [0, 0, 0], + "to": [0, 0, 0], + "faces": { + "up": { "uv": [ 0, 0, 0, 0 ], "texture": "dummythatwillnevergetrendered" } + } + } + ] +} \ No newline at end of file