Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.

Browse Source
This commit is contained in:
Matthew Miller
2018-07-19 12:55:02 +10:00
parent c3d832c3fd
commit 572bf04482
20 changed files with 17201 additions and 16340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java
View File

@ -31,15 +31,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
this.blockMaterial = material;
}
@Override
public boolean isRenderedAsNormalBlock() {
if (blockMaterial == null) {
return true;
} else {
return blockMaterial.isRenderedAsNormalBlock();
}
}
@Override
public boolean isFullCube() {
if (blockMaterial == null) {
@ -112,33 +103,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
}
}
@Override
public boolean isGrassBlocking() {
if (blockMaterial == null) {
return true;
} else {
return blockMaterial.isGrassBlocking();
}
}
@Override
public float getAmbientOcclusionLightValue() {
if (blockMaterial == null) {
return 0;
} else {
return blockMaterial.getAmbientOcclusionLightValue();
}
}
@Override
public int getLightOpacity() {
if (blockMaterial == null) {
return 0;
} else {
return blockMaterial.getLightOpacity();
}
}
@Override
public int getLightValue() {
if (blockMaterial == null) {
@ -166,15 +130,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
}
}
@Override
public boolean isAdventureModeExempt() {
if (blockMaterial == null) {
return false;
} else {
return blockMaterial.isAdventureModeExempt();
}
}
@Override
public boolean isTicksRandomly() {
if (blockMaterial == null) {
@ -184,15 +139,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
}
}
@Override
public boolean isUsingNeighborLight() {
if (blockMaterial == null) {
return false;
} else {
return blockMaterial.isUsingNeighborLight();
}
}
@Override
public boolean isMovementBlocker() {
if (blockMaterial == null) {

60
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/SimpleBlockMaterial.java
View File

@ -23,7 +23,6 @@ import com.sk89q.worldedit.blocks.BlockMaterial;
class SimpleBlockMaterial implements BlockMaterial {
private boolean renderedAsNormalBlock;
private boolean fullCube;
private boolean opaque;
private boolean powerSource;
@ -32,15 +31,10 @@ class SimpleBlockMaterial implements BlockMaterial {
private float hardness;
private float resistance;
private float slipperiness;
private boolean grassBlocking;
private float ambientOcclusionLightValue;
private int lightOpacity;
private int lightValue;
private boolean fragileWhenPushed;
private boolean unpushable;
private boolean adventureModeExempt;
private boolean ticksRandomly;
private boolean usingNeighborLight;
private boolean movementBlocker;
private boolean burnable;
private boolean toolRequired;
@ -48,15 +42,6 @@ class SimpleBlockMaterial implements BlockMaterial {
private boolean isTranslucent;
private boolean hasContainer;
@Override
public boolean isRenderedAsNormalBlock() {
return renderedAsNormalBlock;
}
public void setRenderedAsNormalBlock(boolean renderedAsNormalBlock) {
this.renderedAsNormalBlock = renderedAsNormalBlock;
}
@Override
public boolean isFullCube() {
return fullCube;
@ -129,33 +114,6 @@ class SimpleBlockMaterial implements BlockMaterial {
this.slipperiness = slipperiness;
}
@Override
public boolean isGrassBlocking() {
return grassBlocking;
}
public void setGrassBlocking(boolean grassBlocking) {
this.grassBlocking = grassBlocking;
}
@Override
public float getAmbientOcclusionLightValue() {
return ambientOcclusionLightValue;
}
public void setAmbientOcclusionLightValue(float ambientOcclusionLightValue) {
this.ambientOcclusionLightValue = ambientOcclusionLightValue;
}
@Override
public int getLightOpacity() {
return lightOpacity;
}
public void setLightOpacity(int lightOpacity) {
this.lightOpacity = lightOpacity;
}
@Override
public int getLightValue() {
return lightValue;
@ -183,15 +141,6 @@ class SimpleBlockMaterial implements BlockMaterial {
this.unpushable = unpushable;
}
@Override
public boolean isAdventureModeExempt() {
return adventureModeExempt;
}
public void setAdventureModeExempt(boolean adventureModeExempt) {
this.adventureModeExempt = adventureModeExempt;
}
@Override
public boolean isTicksRandomly() {
return ticksRandomly;
@ -201,15 +150,6 @@ class SimpleBlockMaterial implements BlockMaterial {
this.ticksRandomly = ticksRandomly;
}
@Override
public boolean isUsingNeighborLight() {
return usingNeighborLight;
}
public void setUsingNeighborLight(boolean usingNeighborLight) {
this.usingNeighborLight = usingNeighborLight;
}
@Override
public boolean isMovementBlocker() {
return movementBlocker;