mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-29 18:28:34 +01:00
Compare commits
No commits in common. "6263e819ab5b554982925c7e5d5f527405df0ed7" and "750d2649c8c48458ada7175ac5b95c077041933c" have entirely different histories.
6263e819ab
...
750d2649c8
5 changed files with 10 additions and 10 deletions
|
@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.material.ArmorMaterials;
|
||||||
import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
|
import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
|
||||||
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
|
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
|
||||||
import io.netty.util.internal.ConcurrentSet;
|
import io.netty.util.internal.ConcurrentSet;
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.inventory.EquipmentSlotType;
|
import net.minecraft.inventory.EquipmentSlotType;
|
||||||
|
@ -41,7 +40,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles {
|
||||||
super(ArmorMaterials.GOGGLES, EquipmentSlotType.HEAD, ActuallyItems.defaultProps().setNoRepair().durability(0));
|
super(ArmorMaterials.GOGGLES, EquipmentSlotType.HEAD, ActuallyItems.defaultProps().setNoRepair().durability(0));
|
||||||
this.displayMobs = displayMobs;
|
this.displayMobs = displayMobs;
|
||||||
|
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
//MinecraftForge.EVENT_BUS.register(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isWearing(PlayerEntity player) {
|
public static boolean isWearing(PlayerEntity player) {
|
||||||
|
@ -52,7 +51,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles {
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onClientTick(TickEvent.ClientTickEvent event) {
|
public void onClientTick(TickEvent.ClientTickEvent event) {
|
||||||
PlayerEntity player = Minecraft.getInstance().player;
|
/* PlayerEntity player = ClientProxy.getCurrentPlayer();
|
||||||
if (player != null && isWearing(player)) {
|
if (player != null && isWearing(player)) {
|
||||||
ItemStack face = player.inventory.armor.get(3);
|
ItemStack face = player.inventory.armor.get(3);
|
||||||
if (((IGoggles) face.getItem()).displaySpectralMobs()) {
|
if (((IGoggles) face.getItem()).displaySpectralMobs()) {
|
||||||
|
@ -86,7 +85,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.cachedGlowingEntities.clear();
|
this.cachedGlowingEntities.clear();
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class ItemLeafBlower extends ItemBase implements IDisplayStandItem {
|
||||||
//Breaks the Blocks
|
//Breaks the Blocks
|
||||||
boolean broke = this.breakStuff(world, x, y, z);
|
boolean broke = this.breakStuff(world, x, y, z);
|
||||||
//Plays a Minecart sounds (It really sounds like a Leaf Blower!)
|
//Plays a Minecart sounds (It really sounds like a Leaf Blower!)
|
||||||
world.playSound(null, x, y, z, SoundEvents.MINECART_RIDING, SoundCategory.PLAYERS, 0.2F, 0.001F);
|
world.playSound(null, x, y, z, SoundEvents.MINECART_RIDING, SoundCategory.PLAYERS, 0.3F, 0.001F);
|
||||||
return broke;
|
return broke;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ public class ItemLeafBlower extends ItemBase implements IDisplayStandItem {
|
||||||
BlockPos pos = new BlockPos(x + reachX, y + reachY, z + reachZ);
|
BlockPos pos = new BlockPos(x + reachX, y + reachY, z + reachZ);
|
||||||
Block block = world.getBlockState(pos).getBlock();
|
Block block = world.getBlockState(pos).getBlock();
|
||||||
|
|
||||||
if ((block instanceof BushBlock || block instanceof IForgeShearable) && (this.isAdvanced || !(block instanceof LeavesBlock))) {
|
if ((block instanceof BushBlock || block instanceof IForgeShearable) && (this.isAdvanced || block instanceof LeavesBlock)) {
|
||||||
breakPositions.add(pos);
|
breakPositions.add(pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -322,8 +322,9 @@
|
||||||
"item.actuallyadditions.ring": "Ring (wip)",
|
"item.actuallyadditions.ring": "Ring (wip)",
|
||||||
"item.actuallyadditions.ring.storage": "Blaze Stored (wip)",
|
"item.actuallyadditions.ring.storage": "Blaze Stored (wip)",
|
||||||
"item.actuallyadditions.teleport_staff": "Teleport Staff",
|
"item.actuallyadditions.teleport_staff": "Teleport Staff",
|
||||||
"item.actuallyadditions.leaf_blower": "Leaf Blower",
|
"item.actuallyadditions.hairy_ball": "Ball of Fur (wip)",
|
||||||
"item.actuallyadditions.advanced_leaf_blower": "Advanced Leaf Blower",
|
"item.actuallyadditions.leaf_blower": "Leaf Blower (wip)",
|
||||||
|
"item.actuallyadditions.advanced_leaf_blower": "Advanced Leaf Blower (wip)",
|
||||||
"item.actuallyadditions.crafter_on_a_stick": "Crafting Table On A Stick",
|
"item.actuallyadditions.crafter_on_a_stick": "Crafting Table On A Stick",
|
||||||
"item.actuallyadditions.basic_coil": "Basic Coil (wip)",
|
"item.actuallyadditions.basic_coil": "Basic Coil (wip)",
|
||||||
"item.actuallyadditions.advanced_coil": "Advanced Coil (wip)",
|
"item.actuallyadditions.advanced_coil": "Advanced Coil (wip)",
|
||||||
|
@ -387,8 +388,8 @@
|
||||||
"item.actuallyadditions.lens_of_the_killer": "Lens of the Killer (wip)",
|
"item.actuallyadditions.lens_of_the_killer": "Lens of the Killer (wip)",
|
||||||
"item.actuallyadditions.handheld_filler": "Handheld Filler (wip)",
|
"item.actuallyadditions.handheld_filler": "Handheld Filler (wip)",
|
||||||
"item.actuallyadditions.laser_upgrade_invisibility": "Laser Relay Modifier: Invisibility (wip)",
|
"item.actuallyadditions.laser_upgrade_invisibility": "Laser Relay Modifier: Invisibility (wip)",
|
||||||
"item.actuallyadditions.engineers_goggles": "Engineer's Goggles",
|
"item.actuallyadditions.engineers_goggles": "Engineer's Goggles (wip)",
|
||||||
"item.actuallyadditions.engineers_goggles_advanced": "Engineer's Infrared Goggles",
|
"item.actuallyadditions.engineers_goggles_advanced": "Engineer's Infrared Goggles (wip)",
|
||||||
"item.actuallyadditions.laser_upgrade_range": "Laser Relay Modifier: Range (wip)",
|
"item.actuallyadditions.laser_upgrade_range": "Laser Relay Modifier: Range (wip)",
|
||||||
"item.actuallyadditions.restonia_crystal_shard": "Red Crystal Shard (wip)",
|
"item.actuallyadditions.restonia_crystal_shard": "Red Crystal Shard (wip)",
|
||||||
"item.actuallyadditions.palis_crystal_shard": "Blue Crystal Shard (wip)",
|
"item.actuallyadditions.palis_crystal_shard": "Blue Crystal Shard (wip)",
|
||||||
|
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
Loading…
Reference in a new issue