diff --git a/MC18_notes.txt b/MC18_notes.txt index de9c28fb4..e08825fe5 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -21,7 +21,9 @@ Unless someone figures out a way to use the old one sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack * Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them * Quartz stair textures may be assigned incorrectly - resource pack authors check me -* Glass pane inner faces are not getting culled +* Glass pane inner faces are not getting culled (vanilla bug?) +* Some item forms of technical/non-user blocks are removed + * Full list: [all double slab items, all solid vine items] -- Todo -- * JSON models for everything (tedious/med-hard) diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollector.java b/src/main/java/vazkii/botania/api/mana/IManaCollector.java index 280e46007..f62352864 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollector.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollector.java @@ -18,7 +18,7 @@ import vazkii.botania.api.internal.IManaBurst; * * Implementation Instructions:
* - Override invalidate() and onChunkUnload(), calling ManaNetworkEvent.removeCollector(this); on both.
- * - On the first tick of onUpdate(), call ManaNetworkEvent.addCollector(this); + * - On the first tick of update() (or onLoad() in Forge build 1606 or higher), call ManaNetworkEvent.addCollector(this); */ public interface IManaCollector extends IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index d908495df..bf678aa51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -52,7 +52,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, null, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index ba7808459..8ba380c0b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.entity; +import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -21,6 +23,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import java.util.Map; + public class EntityVineBall extends EntityThrowable { public EntityVineBall(World par1World) { @@ -39,18 +43,18 @@ public class EntityVineBall extends EntityThrowable { protected void onImpact(MovingObjectPosition var1) { if(var1 != null) { EnumFacing dir = var1.sideHit; - int[] metaPlace = new int[] { - 1, 4, 8, 2 - }; - if(dir.getAxis() != EnumFacing.Axis.Y) { + Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, + EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); + + if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { Block block = worldObj.getBlockState(pos).getBlock(); if(block.isAir(worldObj, pos)) { - IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(BlockVine.ALL_FACES[dir.getIndex() + 1], true); + IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); worldObj.setBlockState(pos, state, 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); // todo 1.8 verify + worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); pos = pos.down(); } else break; } diff --git a/src/main/resources/assets/botania/blockstates/solidVine.json b/src/main/resources/assets/botania/blockstates/solidVine.json new file mode 100644 index 000000000..67ee020a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solidVine.json @@ -0,0 +1,36 @@ +{ + "variants": { + "east=false,north=false,south=false,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=true,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=false,up=false,west=true": { "model": "vine_1", "y": 90 }, + "east=false,north=true,south=false,up=false,west=false": { "model": "vine_1", "y": 180 }, + "east=true,north=false,south=false,up=false,west=false": { "model": "vine_1", "y": 270 }, + "east=true,north=true,south=false,up=false,west=false": { "model": "vine_2" }, + "east=true,north=false,south=true,up=false,west=false": { "model": "vine_2", "y": 90 }, + "east=false,north=false,south=true,up=false,west=true": { "model": "vine_2", "y": 180 }, + "east=false,north=true,south=false,up=false,west=true": { "model": "vine_2", "y": 270 }, + "east=true,north=false,south=false,up=false,west=true": { "model": "vine_2_opposite" }, + "east=false,north=true,south=true,up=false,west=false": { "model": "vine_2_opposite", "y": 90 }, + "east=true,north=true,south=true,up=false,west=false": { "model": "vine_3" }, + "east=true,north=false,south=true,up=false,west=true": { "model": "vine_3", "y": 90 }, + "east=false,north=true,south=true,up=false,west=true": { "model": "vine_3", "y": 180 }, + "east=true,north=true,south=false,up=false,west=true": { "model": "vine_3", "y": 270 }, + "east=true,north=true,south=true,up=false,west=true": { "model": "vine_4" }, + "east=false,north=false,south=false,up=true,west=false": { "model": "vine_u" }, + "east=false,north=false,south=true,up=true,west=false": { "model": "vine_1u" }, + "east=false,north=false,south=false,up=true,west=true": { "model": "vine_1u", "y": 90 }, + "east=false,north=true,south=false,up=true,west=false": { "model": "vine_1u", "y": 180 }, + "east=true,north=false,south=false,up=true,west=false": { "model": "vine_1u", "y": 270 }, + "east=true,north=true,south=false,up=true,west=false": { "model": "vine_2u" }, + "east=true,north=false,south=true,up=true,west=false": { "model": "vine_2u", "y": 90 }, + "east=false,north=false,south=true,up=true,west=true": { "model": "vine_2u", "y": 180 }, + "east=false,north=true,south=false,up=true,west=true": { "model": "vine_2u", "y": 270 }, + "east=true,north=false,south=false,up=true,west=true": { "model": "vine_2u_opposite" }, + "east=false,north=true,south=true,up=true,west=false": { "model": "vine_2u_opposite", "y": 90 }, + "east=true,north=true,south=true,up=true,west=false": { "model": "vine_3u" }, + "east=true,north=false,south=true,up=true,west=true": { "model": "vine_3u", "y": 90 }, + "east=false,north=true,south=true,up=true,west=true": { "model": "vine_3u", "y": 180 }, + "east=true,north=true,south=false,up=true,west=true": { "model": "vine_3u", "y": 270 }, + "east=true,north=true,south=true,up=true,west=true": { "model": "vine_4u" } + } +}