Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Made the Cape Option disable floating Awesomeness VIP Blocks that you don't have anyways ha-ha-ha I'm sorry I'm stupid

Browse source
This commit is contained in:
Ellpeck 2015-07-06 19:52:27 +02:00
parent 6023100fac
commit acd7d990f3
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java
View file

@ -19,7 +19,7 @@ public class RenderPlayerEventAA{
@SubscribeEvent(priority = EventPriority.HIGHEST) @SubscribeEvent(priority = EventPriority.HIGHEST)
public void RenderPlayerEvent(RenderPlayerEvent.Pre event){ public void RenderPlayerEvent(RenderPlayerEvent.Pre event){
if(!event.entityPlayer.isInvisible()){ if(!event.entityPlayer.isInvisible() && !event.entityPlayer.getHideCape()){
//Ellpeck //Ellpeck
if(event.entityPlayer.getUniqueID().equals(UUID.fromString("3f9f4a94-95e3-40fe-8895-e8e3e84d1468"))){ if(event.entityPlayer.getUniqueID().equals(UUID.fromString("3f9f4a94-95e3-40fe-8895-e8e3e84d1468"))){
ellpeckRender.render(event.entityPlayer, event.partialRenderTick, 0.3F, 1F); ellpeckRender.render(event.entityPlayer, event.partialRenderTick, 0.3F, 1F);

21
src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java
View file

@ -1,8 +1,11 @@
package ellpeck.actuallyadditions.items.tools; package ellpeck.actuallyadditions.items.tools;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.items.InitItems;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import ellpeck.actuallyadditions.util.ItemUtil; import ellpeck.actuallyadditions.util.ItemUtil;
import ellpeck.actuallyadditions.util.KeyUtil; import ellpeck.actuallyadditions.util.KeyUtil;
@ -12,9 +15,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.EnumRarity; import net.minecraft.item.*;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTool;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -28,9 +29,9 @@ import java.util.Set;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class ItemAllToolAA extends ItemTool implements INameableItem{ public class ItemAllToolAA extends ItemTool implements INameableItem{
public static final Set axeSet = Sets.newHashSet(Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin); public static final Set axeSet = ReflectionHelper.getPrivateValue(ItemAxe.class, (ItemAxe)InitItems.itemAxeEmerald, 0);
public static final Set pickSet = Sets.newHashSet(Blocks.cobblestone, Blocks.double_stone_slab, Blocks.stone_slab, Blocks.stone, Blocks.sandstone, Blocks.mossy_cobblestone, Blocks.iron_ore, Blocks.iron_block, Blocks.coal_ore, Blocks.gold_block, Blocks.gold_ore, Blocks.diamond_ore, Blocks.diamond_block, Blocks.ice, Blocks.netherrack, Blocks.lapis_ore, Blocks.lapis_block, Blocks.redstone_ore, Blocks.lit_redstone_ore, Blocks.rail, Blocks.detector_rail, Blocks.golden_rail, Blocks.activator_rail); public static final Set pickSet = ReflectionHelper.getPrivateValue(ItemPickaxe.class, (ItemPickaxe)InitItems.itemPickaxeEmerald, 0);
public static final Set shovelSet = Sets.newHashSet(Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium); public static final Set shovelSet = ReflectionHelper.getPrivateValue(ItemSpade.class, (ItemSpade)InitItems.itemShovelEmerald, 0);
private static final Set allSet = Sets.newHashSet(); private static final Set allSet = Sets.newHashSet();
static{ static{
@ -42,14 +43,12 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{
private String name; private String name;
private EnumRarity rarity; private EnumRarity rarity;
private ItemStack repairItem; private ItemStack repairItem;
private String oredictName;
public ItemAllToolAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ public ItemAllToolAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){
super(5.0F, toolMat, allSet); super(5.0F, toolMat, allSet);
this.repairItem = repairItem; this.repairItem = repairItem;
this.name = unlocalizedName; this.name = unlocalizedName;
this.oredictName = unlocalizedName;
this.rarity = rarity; this.rarity = rarity;
this.setMaxDamage(this.getMaxDamage()*4); this.setMaxDamage(this.getMaxDamage()*4);
@ -127,10 +126,6 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{
return name; return name;
} }
private String getOredictName(){
return oredictName;
}
@Override @Override
public Set<String> getToolClasses(ItemStack stack){ public Set<String> getToolClasses(ItemStack stack){
HashSet<String> hashSet = new HashSet<String>(); HashSet<String> hashSet = new HashSet<String>();
@ -139,4 +134,4 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{
hashSet.add("shovel"); hashSet.add("shovel");
return hashSet; return hashSet;
} }
} }

6
src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java
View file

@ -21,14 +21,12 @@ public class ItemAxeAA extends ItemAxe implements INameableItem{
private String name; private String name;
private EnumRarity rarity; private EnumRarity rarity;
private ItemStack repairItem; private ItemStack repairItem;
private String oredictName;
public ItemAxeAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){ public ItemAxeAA(ToolMaterial toolMat, ItemStack repairItem, String unlocalizedName, EnumRarity rarity){
super(toolMat); super(toolMat);
this.name = unlocalizedName; this.name = unlocalizedName;
this.rarity = rarity; this.rarity = rarity;
this.repairItem = repairItem; this.repairItem = repairItem;
this.oredictName = name;
} }
@Override @Override
@ -67,8 +65,4 @@ public class ItemAxeAA extends ItemAxe implements INameableItem{
public String getName(){ public String getName(){
return name; return name;
} }
private String getOredictName(){
return oredictName;
}
} }