Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BLIND] Include other blocks in the multi protocol block patch, rename.

This commit is contained in:
asofold 2018-01-15 22:16:09 +01:00
parent e8cf861150
commit a25dc44501
3 changed files with 70 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/VanillaBlocksFactory.java
View File

@ -20,7 +20,7 @@ import java.util.List;
import fr.neatmonster.nocheatplus.compat.blocks.BlockPropertiesSetup;
import fr.neatmonster.nocheatplus.compat.blocks.IPatchBlockPropertiesSetup;
import fr.neatmonster.nocheatplus.compat.blocks.init.vanilla.special.MultiClientProtocolWaterLilyPatch;
import fr.neatmonster.nocheatplus.compat.blocks.init.vanilla.special.MultiClientProtocolBlockShapePatch;
import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
import fr.neatmonster.nocheatplus.logging.StaticLog;
@ -57,7 +57,7 @@ public class VanillaBlocksFactory {
}
// Patches for special circumstances.
for (IPatchBlockPropertiesSetup patch : new IPatchBlockPropertiesSetup[]{
new MultiClientProtocolWaterLilyPatch(),
new MultiClientProtocolBlockShapePatch(),
}) {
try {
if (patch.isAvailable()) {

68
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/special/MultiClientProtocolBlockShapePatch.java Normal file
View File

@ -0,0 +1,68 @@
package fr.neatmonster.nocheatplus.compat.blocks.init.vanilla.special;
import java.util.LinkedList;
import java.util.List;
import org.bukkit.Material;
import fr.neatmonster.nocheatplus.compat.activation.ActivationUtil;
import fr.neatmonster.nocheatplus.compat.blocks.AbstractBlockPropertiesPatch;
import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
import fr.neatmonster.nocheatplus.logging.StaticLog;
import fr.neatmonster.nocheatplus.utilities.StringUtil;
import fr.neatmonster.nocheatplus.utilities.map.BlockFlags;
import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
/**
* WATER_LILY for multi client protocol support between 1.7.x - 1.11.x.
*
* @author asofold
*
*/
public class MultiClientProtocolBlockShapePatch extends AbstractBlockPropertiesPatch {
// TODO: Later just dump these into the generic registry (on activation), let BlockProperties fetch.
public MultiClientProtocolBlockShapePatch() {
activation
.neutralDescription("Block shape patch for multi client protocol support around 1.7.x - 1.12.x.")
.advertise(true)
.setConditionsAND()
.notUnitTest()
.condition(ActivationUtil.getMultiProtocolSupportPluginActivation())
// TODO: Other/More ?
;
}
@Override
public void setupBlockProperties(WorldConfigProvider<?> worldConfigProvider) {
final List<String> done = new LinkedList<String>();
BlockFlags.addFlags(Material.WATER_LILY,
BlockProperties.F_GROUND
| BlockProperties.F_HEIGHT8_1
| BlockProperties.F_GROUND_HEIGHT);
done.add("WATER_LILY");
BlockFlags.addFlags(Material.SOIL,
BlockProperties.F_MIN_HEIGHT16_15
| BlockProperties.F_HEIGHT100
| BlockProperties.F_GROUND_HEIGHT);
done.add("SOIL");
try {
BlockFlags.addFlags(Material.GRASS_PATH,
BlockProperties.F_MIN_HEIGHT16_15
| BlockProperties.F_HEIGHT100
| BlockProperties.F_GROUND_HEIGHT);
done.add("GRASS_PATH");
}
catch (Throwable t) {
// TODO: What throws for enum not there.
}
StaticLog.logInfo("Applied block patches for multi client protocol support: "
+ StringUtil.join(done, ", "));
}
}

37
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/special/MultiClientProtocolWaterLilyPatch.java
View File

@ -1,37 +0,0 @@
package fr.neatmonster.nocheatplus.compat.blocks.init.vanilla.special;
import org.bukkit.Material;
import fr.neatmonster.nocheatplus.compat.activation.ActivationUtil;
import fr.neatmonster.nocheatplus.compat.blocks.AbstractBlockPropertiesPatch;
import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
import fr.neatmonster.nocheatplus.utilities.map.BlockFlags;
import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
/**
* WATER_LILY for multi client protocol support between 1.7.x - 1.11.x.
*
* @author asofold
*
*/
public class MultiClientProtocolWaterLilyPatch extends AbstractBlockPropertiesPatch {
// TODO: Later just dump these into the generic registry (on activation), let BlockProperties fetch.
public MultiClientProtocolWaterLilyPatch() {
activation
.neutralDescription("WATER_LILY block shape patch for multi client protocol support around 1.7.x - 1.12.x.")
.advertise(true)
.setConditionsAND()
.notUnitTest()
.condition(ActivationUtil.getMultiProtocolSupportPluginActivation())
// TODO: Other/More ?
;
}
@Override
public void setupBlockProperties(WorldConfigProvider<?> worldConfigProvider) {
BlockFlags.addFlags(Material.WATER_LILY,
BlockProperties.F_GROUND | BlockProperties.F_HEIGHT8_1 | BlockProperties.F_GROUND_HEIGHT);
}
}