Flatten platforms

This commit is contained in:
Vincent Lee committed 2018-03-06 17:38:47 -06:00
1 parent 3f9993d762
commit b1598d701d
29 files changed
+132 -134

No files matched your search

@@ -97,7 +97,7 @@ public final class ColorHandler {
}
}
return 0xFFFFFF;
}, ModBlocks.platform);
}, ModBlocks.abstrusePlatform, ModBlocks.spectralPlatform, ModBlocks.infrangiblePlatform);
ItemColors items = Minecraft.getMinecraft().getItemColors();
@@ -19,7 +19,6 @@ import vazkii.botania.client.model.FloatingFlowerModel;
import vazkii.botania.client.model.GunModel;
import vazkii.botania.client.model.LexiconModel;
import vazkii.botania.client.model.PlatformModel;
import vazkii.botania.common.item.ItemSparkUpgrade;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.relic.ItemKingKey;
@@ -81,7 +80,16 @@ public class MiscellaneousIcons {
evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model);
// Platforms
evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel());
ModelResourceLocation abstruseName = new ModelResourceLocation("botania:abstruse_platform", "normal");
IBakedModel abstruse = evt.getModelRegistry().getObject(abstruseName);
ModelResourceLocation spectralName = new ModelResourceLocation("botania:spectral_platform", "normal");
IBakedModel spectral = evt.getModelRegistry().getObject(spectralName);
ModelResourceLocation infrangibleName = new ModelResourceLocation("botania:infrangible_platform", "normal");
IBakedModel infrangible = evt.getModelRegistry().getObject(infrangibleName);
evt.getModelRegistry().putObject(abstruseName, new PlatformModel(abstruse));
evt.getModelRegistry().putObject(spectralName, new PlatformModel(spectral));
evt.getModelRegistry().putObject(infrangibleName, new PlatformModel(infrangible));
// Lexicon
evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon_3d_default", "inventory"),
@@ -29,6 +29,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.property.IExtendedBlockState;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.BlockCamo;
import vazkii.botania.common.block.BlockPlatform;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileCamo;
@@ -36,11 +37,20 @@ import javax.annotation.Nonnull;
import java.util.List;
public class PlatformModel implements IBakedModel {
private final IBakedModel original;
public PlatformModel(IBakedModel original) {
this.original = original;
}
@Nonnull
@Override
public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) {
if(state.getBlock() != ModBlocks.platform)
// rendering the item form
if(state == null)
return original.getQuads(state, side, rand);
if(!(state.getBlock() instanceof BlockPlatform))
return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand);
BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer();
@@ -59,8 +69,7 @@ public class PlatformModel implements IBakedModel {
Minecraft mc = Minecraft.getMinecraft();
if(heldState == null && layer == BlockRenderLayer.SOLID) {
// No camo
ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName());
return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand);
return original.getQuads(state, side, rand);
} else if(heldState != null) {
// Some people used this to get an invisible block in the past, accommodate that.
@@ -82,37 +91,21 @@ public class PlatformModel implements IBakedModel {
return ImmutableList.of(); // Nothing renders
}
@Override
public boolean isAmbientOcclusion() {
return true;
@Override public boolean isAmbientOcclusion() {
return original.isAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return true;
@Override public boolean isGui3d() {
return original.isGui3d();
}
@Override
public boolean isBuiltInRenderer() {
return false;
@Override public boolean isBuiltInRenderer() {
return original.isBuiltInRenderer();
}
@Nonnull
@Override
public TextureAtlasSprite getParticleTexture() {
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0");
@Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); }
@Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() {
return original.getItemCameraTransforms();
}
@Nonnull
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return ItemCameraTransforms.DEFAULT;
}
@Nonnull
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.NONE;
@Nonnull @Override public ItemOverrideList getOverrides() {
return original.getOverrides();
}
private static class FakeBlockAccess implements IBlockAccess {
@@ -50,39 +50,35 @@ import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Locale;
public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost {
public BlockPlatform() {
super(Material.WOOD, LibBlockNames.PLATFORM);
public enum Variant {
ABSTRUSE,
SPECTRAL,
INFRANGIBLE
}
public final Variant variant;
public BlockPlatform(Variant v) {
super(Material.WOOD, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.PLATFORM_SUFFIX);
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE));
this.variant = v;
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, },
return new ExtendedBlockState(this, new IProperty[0],
new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS });
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal();
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta > PlatformVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]);
}
@Nonnull
@Override
public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) {
@@ -103,39 +99,25 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
return true;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> stacks) {
for(int i = 0; i < PlatformVariant.values().length; i++)
stacks.add(new ItemStack(this, 1, i));
}
@Override
public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List<AxisAlignedBB> stacks, Entity par7Entity, boolean isActualState) {
PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT);
if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking()))
if(variant == Variant.INFRANGIBLE || variant == Variant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking()))
super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity, isActualState);
}
@Override
public float getBlockHardness(IBlockState state, World world, BlockPos pos) {
PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT);
return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, world, pos);
return variant == Variant.INFRANGIBLE ? -1F : super.getBlockHardness(state, world, pos);
}
@Override
public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity entity) {
return state.getValue(BotaniaStateProps.PLATFORM_VARIANT) != PlatformVariant.INFRANGIBLE;
return variant != Variant.INFRANGIBLE;
}
@Override
public float getExplosionResistance(World world, BlockPos pos, @Nonnull Entity exploder, Explosion explosion) {
return world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT) != PlatformVariant.INFRANGIBLE ? super.getExplosionResistance(world, pos, exploder, explosion) : Float.MAX_VALUE;
public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) {
return variant != Variant.INFRANGIBLE ? super.getExplosionResistance(world, pos, exploder, explosion) : Float.MAX_VALUE;
}
@Nonnull
@@ -146,8 +128,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT);
return variant == PlatformVariant.ABSTRUSE ? LexiconData.platform : variant == PlatformVariant.INFRANGIBLE ? null : LexiconData.spectralPlatform;
return variant == Variant.ABSTRUSE ? LexiconData.platform : variant == Variant.INFRANGIBLE ? null : LexiconData.spectralPlatform;
}
@Override
@@ -160,13 +141,4 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
public boolean isGhost(IBlockState state, World world, BlockPos pos) {
return true;
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerBlockToState(this, 3);
// Statemapper after item registration, because the items should be registered to the actual variant names
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build());
}
}
@@ -159,7 +159,9 @@ public final class ModBlocks {
public static final Block gatheringDrum = new BlockForestDrum(BlockForestDrum.Variant.GATHERING);
public static final Block canopyDrum = new BlockForestDrum(BlockForestDrum.Variant.CANOPY);
public static final Block shinyFlower = new BlockShinyFlower();
public static final Block platform = new BlockPlatform();
public static final Block abstrusePlatform = new BlockPlatform(BlockPlatform.Variant.ABSTRUSE);
public static final Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL);
public static final Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE);
public static final Block alfPortal = new BlockAlfPortal();
public static final Block dreamwood = new BlockDreamwood();
public static final Block conjurationCatalyst = new BlockConjurationCatalyst();
@@ -278,7 +280,9 @@ public final class ModBlocks {
r.register(gatheringDrum);
r.register(canopyDrum);
r.register(shinyFlower);
r.register(platform);
r.register(abstrusePlatform);
r.register(spectralPlatform);
r.register(infrangiblePlatform);
r.register(alfPortal);
r.register(dreamwood);
r.register(conjurationCatalyst);
@@ -400,7 +404,9 @@ public final class ModBlocks {
r.register(new ItemBlockMod(gatheringDrum).setRegistryName(gatheringDrum.getRegistryName()));
r.register(new ItemBlockMod(canopyDrum).setRegistryName(canopyDrum.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(shinyFlower).setRegistryName(shinyFlower.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(platform).setRegistryName(platform.getRegistryName()));
r.register(new ItemBlockMod(abstrusePlatform).setRegistryName(abstrusePlatform.getRegistryName()));
r.register(new ItemBlockMod(spectralPlatform).setRegistryName(spectralPlatform.getRegistryName()));
r.register(new ItemBlockMod(infrangiblePlatform).setRegistryName(infrangiblePlatform.getRegistryName()));
r.register(new ItemBlockMod(alfPortal).setRegistryName(alfPortal.getRegistryName()));
r.register(new ItemBlockDreamwood(dreamwood).setRegistryName(dreamwood.getRegistryName()));
r.register(new ItemBlockMod(conjurationCatalyst).setRegistryName(conjurationCatalyst.getRegistryName()));
@@ -194,7 +194,9 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.craftPattern3_2);
addItem(ModItems.craftPatternDonut);
addBlock(ModBlocks.platform);
addBlock(ModBlocks.abstrusePlatform);
addBlock(ModBlocks.spectralPlatform);
addBlock(ModBlocks.infrangiblePlatform);
addBlock(ModBlocks.alfPortal);
addBlock(ModBlocks.altar);
addBlock(ModBlocks.runeAltar);
@@ -498,9 +498,9 @@ public final class ModCraftingRecipes {
recipeOpenCrate = path("opencrate_0");
recipeForestEye = ModBlocks.forestEye.getRegistryName();
recipeForestDrum = ModBlocks.wildDrum.getRegistryName();
recipePlatform = path("platform_0");
recipePlatform = ModBlocks.abstrusePlatform.getRegistryName();
recipeConjurationCatalyst = ModBlocks.conjurationCatalyst.getRegistryName();
recipeSpectralPlatform = path("platform_1");
recipeSpectralPlatform = ModBlocks.spectralPlatform.getRegistryName();
recipeGatherDrum = ModBlocks.gatheringDrum.getRegistryName();
recipePlaceholder = ModItems.placeholder.getRegistryName();
recipeCraftCrate = path("opencrate_1");
@@ -182,6 +182,14 @@ public class FlattenItems implements IFixableData {
case 2: return ModBlocks.gaiaPylon.getRegistryName().toString();
}
});
LOOKUP.put("botania:platform", i -> {
switch (i) {
default:
case 0: return ModBlocks.abstrusePlatform.getRegistryName().toString();
case 1: return ModBlocks.spectralPlatform.getRegistryName().toString();
case 2: return ModBlocks.infrangiblePlatform.getRegistryName().toString();
}
});
}
@Override
@@ -38,6 +38,7 @@ public final class LibBlockNames {
public static final String DRUM_PREFIX = "drum_";
public static final String SHINY_FLOWER = "shinyFlower";
public static final String PLATFORM = "platform";
public static final String PLATFORM_SUFFIX = "_" + PLATFORM;
public static final String ALF_PORTAL = "alfheimPortal";
public static final String DREAM_WOOD = "dreamwood";
public static final String CONJURATION_CATALYST = "conjurationCatalyst";