Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix some other minor bugs that I found quickly.

Browse source 
I really need to start working on actually repairing the textures.
This commit is contained in:
Ellpeck 2016-01-08 08:18:27 +01:00
parent 5a1b6f9d78
commit 6ee039fcc2
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
View file

@ -68,6 +68,7 @@ public class SpecialRenderInit{
} }
@SubscribeEvent(priority = EventPriority.HIGHEST) @SubscribeEvent(priority = EventPriority.HIGHEST)
//TODO Fix floating item
public void onPlayerRender(RenderPlayerEvent.Pre event){ public void onPlayerRender(RenderPlayerEvent.Pre event){
if(!specialList.isEmpty()){ if(!specialList.isEmpty()){
for(Map.Entry<String, RenderSpecial> entry : specialList.entrySet()){ for(Map.Entry<String, RenderSpecial> entry : specialList.entrySet()){

8
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -15,6 +15,7 @@ import cofh.api.energy.IEnergyReceiver;
import de.ellpeck.actuallyadditions.api.Position; import de.ellpeck.actuallyadditions.api.Position;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
@ -363,6 +364,7 @@ public class WorldUtil{
*/ */
public static boolean playerHarvestBlock(World world, Position pos, EntityPlayer player){ public static boolean playerHarvestBlock(World world, Position pos, EntityPlayer player){
Block block = pos.getBlock(world); Block block = pos.getBlock(world);
IBlockState state = pos.getBlockState(world);
int meta = pos.getMetadata(world); int meta = pos.getMetadata(world);
//If the Block can be harvested or not //If the Block can be harvested or not
boolean canHarvest = block.canHarvestBlock(world, pos, player); boolean canHarvest = block.canHarvestBlock(world, pos, player);
@ -377,7 +379,7 @@ public class WorldUtil{
if(!world.isRemote){ if(!world.isRemote){
//Server-Side only, special cases //Server-Side only, special cases
block.onBlockHarvested(world, pos, pos.getBlockState(world), player); block.onBlockHarvested(world, pos, state, player);
} }
else{ else{
//Shows the Harvest Particles and plays the Block's Sound //Shows the Harvest Particles and plays the Block's Sound
@ -389,12 +391,12 @@ public class WorldUtil{
//Actually removes the Block from the World //Actually removes the Block from the World
if(removed){ if(removed){
//Before the Block is destroyed, special cases //Before the Block is destroyed, special cases
block.onBlockDestroyedByPlayer(world, pos, pos.getBlockState(world)); block.onBlockDestroyedByPlayer(world, pos, state);
if(!world.isRemote && !player.capabilities.isCreativeMode){ if(!world.isRemote && !player.capabilities.isCreativeMode){
//Actually drops the Block's Items etc. //Actually drops the Block's Items etc.
if(canHarvest){ if(canHarvest){
block.harvestBlock(world, player, pos, pos.getBlockState(world), pos.getTileEntity(world)); block.harvestBlock(world, player, pos, state, pos.getTileEntity(world));
} }
//Only drop XP when no Silk Touch is applied //Only drop XP when no Silk Touch is applied
if(!EnchantmentHelper.getSilkTouchModifier(player)){ if(!EnchantmentHelper.getSilkTouchModifier(player)){