[BLIND] Add 1.12 blocks.

NoCheatPlus · May 14, 2017 · 9e763c2 · 9e763c2
1 parent b5b6e78
commit 9e763c2
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 1 deletion.
diff --git a/...ore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/BlocksMC1_12.java b/...ore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/BlocksMC1_12.java
@@ -0,0 +1,72 @@
+package fr.neatmonster.nocheatplus.compat.blocks.init.vanilla;
+
+import org.bukkit.Material;
+
+import fr.neatmonster.nocheatplus.compat.blocks.BlockPropertiesSetup;
+import fr.neatmonster.nocheatplus.compat.blocks.init.BlockInit;
+import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
+import fr.neatmonster.nocheatplus.logging.StaticLog;
+import fr.neatmonster.nocheatplus.utilities.map.BlockFlags;
+import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
+import fr.neatmonster.nocheatplus.utilities.map.BlockProperties.BlockProps;
+
+@SuppressWarnings("deprecation")
+public class BlocksMC1_12 implements BlockPropertiesSetup {
+
+    private static final int firstTerracotta = 235;
+    private static final int lastTerracotta = 250;
+
+    public BlocksMC1_12() {
+        BlockInit.assertMaterialNameMatch(251, "CONCRETE");
+        for (int i = firstTerracotta; i <= lastTerracotta; i++) {
+            BlockInit.assertMaterialNameMatch(i, "GLAZED_TERRACOTTA");
+        }
+    }
+
+    @Override
+    public void setupBlockProperties(WorldConfigProvider<?> worldConfigProvider) {
+
+        //        * MISSING 235(WHITE_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 236(ORANGE_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 237(MAGENTA_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 238(LIGHT_BLUE_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 239(YELLOW_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 240(LIME_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 241(PINK_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 242(GRAY_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 243(SILVER_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 244(CYAN_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 245(PURPLE_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 246(BLUE_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 247(BROWN_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 248(GREEN_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 249(RED_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 250(BLACK_GLAZED_TERRACOTTA / SOLID+GROUND) 
+        //        * MISSING 251(CONCRETE / SOLID+GROUND) 
+        //        * MISSING 252(CONCRETE_POWDER / SOLID+GROUND)
+
+        BlockProps props = new BlockProps(BlockProperties.woodPickaxe, 1.4f, 
+                BlockProperties.secToMs(7.0, 1.05, 0.55, 0.35, 0.3, 0.2));
+        for (int i = firstTerracotta; i <= lastTerracotta; i++) {
+            // Set flags as with "hardened clay".
+            BlockFlags.setFlagsAs(i, 172);
+            // Breaking times.
+            BlockProperties.setBlockProps(i, props);
+        }
+
+        // Concrete
+        BlockFlags.setFlagsAs(251, Material.COBBLESTONE);
+        BlockProperties.setBlockProps(251,
+                new BlockProps(BlockProperties.woodPickaxe, 1.8f,
+                        // TODO: 2.7 with bare hands seems unlikely.
+                        BlockProperties.secToMs(2.7, 1.35, 0.7, 0.45, 0.35, 0.25)
+                        )
+                );
+
+        // Concrete powder
+        BlockInit.setAs(251, Material.DIRT);
+
+        StaticLog.logInfo("Added block-info for Minecraft 1.12 blocks.");
+    }
+
+}
diff --git a/...main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/VanillaBlocksFactory.java b/...main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/VanillaBlocksFactory.java
@@ -38,6 +38,7 @@ public Collection<String> setupVanillaBlocks(final WorldConfigProvider<?> worldC
             setups.add(new BlocksMC1_9());
             setups.add(new BlocksMC1_10());
             setups.add(new BlocksMC1_11());
+            setups.add(new BlocksMC1_12());
         }
         catch(Throwable t){}
         for (final BlockPropertiesSetup setup : setups){

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java
@@ -622,6 +622,8 @@ public void validate() {
     /** Minimum height 1/16 (1 - 0.0625). */
     public static final long F_MIN_HEIGHT16_1           = 0x80000000; // TODO: Lily pad min height of MC versions?
 
+    // TODO: Convenience constants combining all height / minheight flags.
+
     // TODO: When flags are out, switch to per-block classes :p.
 
     // Special case activation flags.

diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/registry/MCAccessFactory.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/registry/MCAccessFactory.java
@@ -122,7 +122,7 @@ private MCAccess getMCAccessCraftBukkit(List<Throwable> throwables) {
                 "fr.neatmonster.nocheatplus.compat.spigotcb1_8_R2.MCAccessSpigotCB1_8_R2", // 1.8.3 (1_8_R2)
                 "fr.neatmonster.nocheatplus.compat.spigotcb1_8_R1.MCAccessSpigotCB1_8_R1", // 1.8 (1_8_R1)
 
-                // Dedicated CB (original)
+                // Dedicated CB (original / Spigot)
                 "fr.neatmonster.nocheatplus.compat.cb3100.MCAccessCB3100", // 1.7.10
                 "fr.neatmonster.nocheatplus.compat.cb3043.MCAccessCB3043", // 1.7.8|1.7.9
                 "fr.neatmonster.nocheatplus.compat.cb3026.MCAccessCB3026", // 1.7.5