Upstream/ChestsPlusPlus
1
0
Fork 0
mirror of https://github.com/JamesPeters98/ChestsPlusPlus.git synced 2025-01-25 09:41:32 +01:00
Code Issues Projects Releases Wiki Activity

Chest Opener Fix

Browse Source 
Chests were playing the close sound after keeping the inventory open for a couple seconds.
This commit is contained in:
jameslfc19 2020-07-09 15:30:47 +01:00
parent b7fd0ccfb4
commit 8fa5a1c781
6 changed files with 122 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChestsPlusPlus_1_14/src/main/java/com/jamesdpeters/minecraft/chests/v1_14_R1/ChestOpener_1_14.java
View File

@ -30,7 +30,7 @@ public class ChestOpener_1_14 implements ChestOpener {
customTileEntityChest = (CustomTileEntityChest) tileEntity;
}
customTileEntityChest.setOpen(open);
customTileEntityChest.onOpen();
customTileEntityChest.animate();
}
}
}

40
ChestsPlusPlus_1_14/src/main/java/com/jamesdpeters/minecraft/chests/v1_14_R1/CustomTileEntityChest.java
View File

@ -2,24 +2,62 @@ package com.jamesdpeters.minecraft.chests.v1_14_R1;
import net.minecraft.server.v1_14_R1.Block;
import net.minecraft.server.v1_14_R1.BlockChest;
import net.minecraft.server.v1_14_R1.BlockPropertyChestType;
import net.minecraft.server.v1_14_R1.EntityHuman;
import net.minecraft.server.v1_14_R1.EnumDirection;
import net.minecraft.server.v1_14_R1.SoundCategory;
import net.minecraft.server.v1_14_R1.SoundEffect;
import net.minecraft.server.v1_14_R1.SoundEffects;
import net.minecraft.server.v1_14_R1.TileEntityChest;
public class CustomTileEntityChest extends TileEntityChest {
private int phantomViewers;
private int phantomViewers = 0;
private int previousViewers = 0;
@Override
public void tick() {
//Don't need to tick
}
@Override
public void onOpen() {
//Do nothing
}
public void animate(){
Block block = this.getBlock().getBlock();
if (block instanceof BlockChest) {
this.world.playBlockAction(this.position, block, 1, phantomViewers);
this.world.applyPhysics(this.position, block);
//Play block sound.
if(phantomViewers == 1 && previousViewers == 0) this.a(SoundEffects.BLOCK_CHEST_OPEN);
if(phantomViewers == 0) this.a(SoundEffects.BLOCK_CHEST_CLOSE);
}
}
public void setOpen(boolean open){
previousViewers = phantomViewers;
if(open) phantomViewers++;
else phantomViewers--;
if(phantomViewers < 0) phantomViewers = 0;
}
private void a(SoundEffect soundeffect) {
BlockPropertyChestType blockpropertychesttype = this.getBlock().get(BlockChest.b);
if (blockpropertychesttype != BlockPropertyChestType.LEFT) {
double d0 = (double)this.position.getX() + 0.5D;
double d1 = (double)this.position.getY() + 0.5D;
double d2 = (double)this.position.getZ() + 0.5D;
if (blockpropertychesttype == BlockPropertyChestType.RIGHT) {
EnumDirection enumdirection = BlockChest.j(this.getBlock());
d0 += (double)enumdirection.getAdjacentX() * 0.5D;
d2 += (double)enumdirection.getAdjacentZ() * 0.5D;
}
this.world.playSound(null, d0, d1, d2, soundeffect, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
}
}
}

2
ChestsPlusPlus_1_15/src/main/java/com/jamesdpeters/minecraft/chests/v1_15_R1/ChestOpener_1_15.java
View File

@ -30,7 +30,7 @@ public class ChestOpener_1_15 implements ChestOpener {
customTileEntityChest = (CustomTileEntityChest) tileEntity;
}
customTileEntityChest.setOpen(open);
customTileEntityChest.onOpen();
customTileEntityChest.animate();
}
}
}

40
ChestsPlusPlus_1_15/src/main/java/com/jamesdpeters/minecraft/chests/v1_15_R1/CustomTileEntityChest.java
View File

@ -2,24 +2,62 @@ package com.jamesdpeters.minecraft.chests.v1_15_R1;
import net.minecraft.server.v1_15_R1.Block;
import net.minecraft.server.v1_15_R1.BlockChest;
import net.minecraft.server.v1_15_R1.BlockPropertyChestType;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EnumDirection;
import net.minecraft.server.v1_15_R1.SoundCategory;
import net.minecraft.server.v1_15_R1.SoundEffect;
import net.minecraft.server.v1_15_R1.SoundEffects;
import net.minecraft.server.v1_15_R1.TileEntityChest;
public class CustomTileEntityChest extends TileEntityChest {
private int phantomViewers;
private int phantomViewers = 0;
private int previousViewers = 0;
@Override
public void tick() {
//Don't need to tick
}
@Override
public void onOpen() {
//Do nothing
}
public void animate(){
Block block = this.getBlock().getBlock();
if (block instanceof BlockChest) {
this.world.playBlockAction(this.position, block, 1, phantomViewers);
this.world.applyPhysics(this.position, block);
//Play block sound.
if(phantomViewers == 1 && previousViewers == 0) this.a(SoundEffects.BLOCK_CHEST_OPEN);
if(phantomViewers == 0) this.a(SoundEffects.BLOCK_CHEST_CLOSE);
}
}
public void setOpen(boolean open){
previousViewers = phantomViewers;
if(open) phantomViewers++;
else phantomViewers--;
if(phantomViewers < 0) phantomViewers = 0;
}
private void a(SoundEffect soundeffect) {
BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType)this.getBlock().get(BlockChest.c);
if (blockpropertychesttype != BlockPropertyChestType.LEFT) {
double d0 = (double)this.position.getX() + 0.5D;
double d1 = (double)this.position.getY() + 0.5D;
double d2 = (double)this.position.getZ() + 0.5D;
if (blockpropertychesttype == BlockPropertyChestType.RIGHT) {
EnumDirection enumdirection = BlockChest.i(this.getBlock());
d0 += (double)enumdirection.getAdjacentX() * 0.5D;
d2 += (double)enumdirection.getAdjacentZ() * 0.5D;
}
this.world.playSound((EntityHuman)null, d0, d1, d2, soundeffect, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
}
}
}

2
ChestsPlusPlus_1_16/src/main/java/com/jamesdpeters/minecraft/chests/v1_16_R1/ChestOpener_1_16.java
View File

@ -31,7 +31,7 @@ public class ChestOpener_1_16 implements ChestOpener {
customTileEntityChest = (CustomTileEntityChest) tileEntity;
}
customTileEntityChest.setOpen(open);
customTileEntityChest.onOpen();
customTileEntityChest.animate();
}
}
}

42
ChestsPlusPlus_1_16/src/main/java/com/jamesdpeters/minecraft/chests/v1_16_R1/CustomTileEntityChest.java
View File

@ -2,24 +2,64 @@ package com.jamesdpeters.minecraft.chests.v1_16_R1;
import net.minecraft.server.v1_16_R1.Block;
import net.minecraft.server.v1_16_R1.BlockChest;
import net.minecraft.server.v1_16_R1.BlockPropertyChestType;
import net.minecraft.server.v1_16_R1.EntityHuman;
import net.minecraft.server.v1_16_R1.EnumDirection;
import net.minecraft.server.v1_16_R1.SoundCategory;
import net.minecraft.server.v1_16_R1.SoundEffect;
import net.minecraft.server.v1_16_R1.SoundEffects;
import net.minecraft.server.v1_16_R1.TileEntityChest;
import org.bukkit.Bukkit;
public class CustomTileEntityChest extends TileEntityChest {
private int phantomViewers;
private int phantomViewers = 0;
private int previousViewers = 0;
@Override
public void tick() {
//Don't need to tick
}
@Override
protected void onOpen() {
//Do nothing
}
public void animate(){
Block block = this.getBlock().getBlock();
if (block instanceof BlockChest) {
this.world.playBlockAction(this.position, block, 1, phantomViewers);
this.world.applyPhysics(this.position, block);
//Play block sound.
Bukkit.broadcastMessage("Viewers: "+phantomViewers+" Prev: "+previousViewers);
if(phantomViewers == 1 && previousViewers == 0) this.a(SoundEffects.BLOCK_CHEST_OPEN);
if(phantomViewers == 0) this.a(SoundEffects.BLOCK_CHEST_CLOSE);
}
}
public void setOpen(boolean open){
previousViewers = phantomViewers;
if(open) phantomViewers++;
else phantomViewers--;
if(phantomViewers < 0) phantomViewers = 0;
}
private void a(SoundEffect soundeffect) {
BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType)this.getBlock().get(BlockChest.c);
if (blockpropertychesttype != BlockPropertyChestType.LEFT) {
double d0 = (double)this.position.getX() + 0.5D;
double d1 = (double)this.position.getY() + 0.5D;
double d2 = (double)this.position.getZ() + 0.5D;
if (blockpropertychesttype == BlockPropertyChestType.RIGHT) {
EnumDirection enumdirection = BlockChest.h(this.getBlock());
d0 += (double)enumdirection.getAdjacentX() * 0.5D;
d2 += (double)enumdirection.getAdjacentZ() * 0.5D;
}
this.world.playSound((EntityHuman)null, d0, d1, d2, soundeffect, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
}
}
}