Fix almost all itemblock models

This commit is contained in:
Vincent Lee committed 2019-04-01 00:18:33 -05:00
1 parent 9173ebc5c4
commit 99b2f61fc7
210 files changed
+537 -49

No files matched your search

@@ -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,
@@ -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));
@@ -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<TileRFGenerator> TYPE;
private static final int MANA_TO_FE = 10;
private static final int MAX_ENERGY = 1280 * MANA_TO_FE;
@@ -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";
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/catalyst_alchemy" }
"": { "model": "botania:block/alchemy_catalyst" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/black_pavement" }
"": { "model": "botania:block/black_pavement" }
}
}
@@ -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" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/blue_pavement" }
"": { "model": "botania:block/blue_pavement" }
}
}
@@ -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" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/catalyst_conjuration" }
"": { "model": "botania:block/conjuration_catalyst" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pool_creative" }
"": { "model": "botania:block/creative_pool" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pool_diluted" }
"": { "model": "botania:block/diluted_pool" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/spreader_elven" }
"": { "model": "botania:block/elven_spreader" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pool_fabulous" }
"": { "model": "botania:block/fabulous_pool" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/eye_of_ancients" }
"": { "model": "botania:block/forest_eye" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/spreader_gaia" }
"": { "model": "botania:block/gaia_spreader" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/green_pavement" }
"": { "model": "botania:block/green_pavement" }
}
}
@@ -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" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/manastorm_charge" }
"": { "model": "botania:block/mana_bomb" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pool_default" }
"": { "model": "botania:block/mana_pool" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/spreader_mana" }
"": { "model": "botania:block/mana_spreader" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/force_relay" }
"": { "model": "botania:block/piston_relay" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/red_pavement" }
"": { "model": "botania:block/red_pavement" }
}
}
@@ -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" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/spreader_redstone" }
"": { "model": "botania:block/redstone_spreader" }
}
}
@@ -1,6 +1,5 @@
{
"variants": {
"powered=true": { "model": "botania:block/spark_tinkerer" },
"powered=false": { "model": "botania:block/spark_tinkerer" }
"": { "model": "botania:block/spark_tinkerer" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/life_imbuer" }
"": { "model": "botania:block/spawner_claw" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/white_pavement" }
"": { "model": "botania:block/white_pavement" }
}
}
@@ -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" }
}
}
@@ -1,5 +1,5 @@
{
"variants": {
"": { "model": "botania:block/pavement/yellow_pavement" }
"": { "model": "botania:block/yellow_pavement" }
}
}
@@ -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" }
}
}
@@ -7,6 +7,6 @@
"predicate": {
"botania:full": 1
},
"model": "botania:block/pool_creative_full"
"model": "botania:block/creative_pool_full"
}]
}
@@ -7,6 +7,6 @@
"predicate": {
"botania:full": 1
},
"model": "botania:block/pool_diluted_full"
"model": "botania:block/diluted_pool_full"
}]
}
@@ -7,6 +7,6 @@
"predicate": {
"botania:full": 1
},
"model": "botania:block/pool_fabulous_full"
"model": "botania:block/fabulous_pool_full"
}]
}
@@ -7,6 +7,6 @@
"predicate": {
"botania:full": 1
},
"model": "botania:block/pool_default_full"
"model": "botania:block/mana_pool_full"
}]
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/abstruse_platform"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/alchemy_catalyst"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/alfheim_portal"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_default"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_desert"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_forest"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_fungal"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_mesa"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_mossy"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_mountain"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_plains"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_swamp"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/apothecary_taiga"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_0"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_1"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_10"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_11"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_12"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_13"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_14"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_15"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_2"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_3"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_4"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_5"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_6"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_7"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_8"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/azulejo_9"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/bifrost"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/black_pavement"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/petal_block"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/blaze_block"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/quartz/blaze_quartz"
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/blue_pavement"
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/petal"
}
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/petal_block"
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:items/petal"
}
}
@@ -0,0 +1,3 @@
{
"parent": "botania:block/petal_block"
}
Loaded 100 of 210 files, more files were not shown because too many files have changed in this diff. Show more