fix b1.9 features

src/main/java/com/github/dirtpowered/releasetobeta/data/block/HardnessTable.java

@@ -22,45 +22,55 @@
 
 package com.github.dirtpowered.releasetobeta.data.block;
 
+import com.github.dirtpowered.betaprotocollib.data.version.MinecraftVersion;
+import com.github.dirtpowered.releasetobeta.configuration.R2BConfiguration;
+
 import java.util.Arrays;
 
 public enum HardnessTable {
-    BURNING_FURNACE(62, 3.5F, false, 278, 257, 274, 270, 285),
-    DETECTOR_RAIL(28, 0.7F, false, -1),
-    DISPENSER(23, 3.5F, false, 278, 257, 274, 270, 285),
-    FENCE(85, 2.0F, false, -1),
-    FURNACE(61, 3.5F, false, 278, 257, 274, 270, 285),
-    GLOWING_REDSTONE_ORE(74, 3.0F, true, 278, 257, 274, 270, 285),
-    JUKEBOX(84, 2.0F, false, -1),
-    LADDER(65, 0.4F, false, -1),
-    MOB_SPAWNER(52, 5.0F, false, 278, 257, 274, 270, 285),
-    NOTE_BLOCK(25, 0.8F, false, -1),
-    OBSIDIAN(49, 10.0F, false, 278),
-    POWERED_RAIL(27, 0.7F, false, -1),
-    RAIL(66, 0.7F, false, -1),
-    REDSTONE_ORE(73, 3.0F, true, 278, 257, 274, 270, 285),
-    STONE_PRESSURE_PLATE(70, 0.5F, false, 278, 257, 274, 270, 285),
-    WOODEN_PRESSURE_PLATE(72, 0.5F, false, -1),
-    WOODEN_TRAP_DOOR(96, 3.0F, false, -1),
-    WOOD_STAIRS(53, 2.0F, false, -1),
-    WORKBENCH(58, 2.5F, false, -1),
-    IRON_DOOR_BLOCK(71, 5.0F, false, 278, 257, 274, 270, 285),
-    SOUL_SAND(88, 0.5F, false, 277, 256, 284, 273);
+    BURNING_FURNACE(62, 3.5F, false, MinecraftVersion.B_1_9, 278, 257, 274, 270, 285),
+    DETECTOR_RAIL(28, 0.7F, false, null, -1),
+    DISPENSER(23, 3.5F, false, null, 278, 257, 274, 270, 285),
+    FENCE(85, 2.0F, false, MinecraftVersion.B_1_9, -1),
+    FURNACE(61, 3.5F, false, MinecraftVersion.B_1_9, 278, 257, 274, 270, 285),
+    GLOWING_REDSTONE_ORE(74, 3.0F, true, MinecraftVersion.B_1_9, 278, 257, 274, 270, 285),
+    JUKEBOX(84, 2.0F, false, null, -1),
+    LADDER(65, 0.4F, false, null, -1),
+    MOB_SPAWNER(52, 5.0F, false, MinecraftVersion.B_1_9, 278, 257, 274, 270, 285),
+    NOTE_BLOCK(25, 0.8F, false, null, -1),
+    OBSIDIAN(49, 10.0F, false, MinecraftVersion.B_1_9, 278),
+    POWERED_RAIL(27, 0.7F, false, null, -1),
+    RAIL(66, 0.7F, false, null, -1),
+    REDSTONE_ORE(73, 3.0F, true, MinecraftVersion.B_1_9, 278, 257, 274, 270, 285),
+    STONE_PRESSURE_PLATE(70, 0.5F, false, null, 278, 257, 274, 270, 285),
+    WOODEN_PRESSURE_PLATE(72, 0.5F, false, null, -1),
+    WOODEN_TRAP_DOOR(96, 3.0F, false, null, -1),
+    WOOD_STAIRS(53, 2.0F, false, null, -1),
+    WORKBENCH(58, 2.5F, false, MinecraftVersion.B_1_9, -1),
+    IRON_DOOR_BLOCK(71, 5.0F, false, null, 278, 257, 274, 270, 285),
+    SOUL_SAND(88, 0.5F, false, MinecraftVersion.B_1_9, 277, 256, 284, 273);
 
     private int blockId;
     private float betaHardness;
     private int[] allowedTools;
     private boolean respectToolMultipler;
+    private MinecraftVersion excludedVersion;
 
-    HardnessTable(int blockId, float betaHardness, boolean respectToolMultipler, int... allowedTools) {
+    HardnessTable(int blockId, float betaHardness, boolean respectToolMultipler, MinecraftVersion exclude, int... allowedTools) {
         this.blockId = blockId;
         this.betaHardness = betaHardness;
         this.respectToolMultipler = respectToolMultipler;
+        this.excludedVersion = exclude;
         this.allowedTools = allowedTools;
     }
 
     public static boolean exist(int blockId) {
-        return Arrays.stream(values()).anyMatch(table -> blockId == table.blockId);
+        for (HardnessTable table : values()) {
+            if (blockId == table.blockId && !table.excludedVersion.isNewerOrEqual(R2BConfiguration.version)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public static int getMiningTicks(int blockId, int toolId) {

src/main/java/com/github/dirtpowered/releasetobeta/network/protocol/B_1_9.java

@@ -142,7 +142,7 @@
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_7.ClientTeleportConfirmTranslator;
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_7.ClientUpdateSignTranslator;
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_7.ClientWindowActionTranslator;
-import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_8.ClientCreativeInventoryActionTranslator;
+import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_9.ClientCreativeInventoryActionTranslator;
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_8.ClientKeepAliveTranslator;
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_8.ClientPlayerStateTranslator;
 import com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_8.ClientRequestTranslator;

src/main/java/com/github/dirtpowered/releasetobeta/network/translator/moderntobeta/B_1_9/ClientCreativeInventoryActionTranslator.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 Dirt Powered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.dirtpowered.releasetobeta.network.translator.moderntobeta.B_1_9;
+
+import com.github.dirtpowered.betaprotocollib.packet.Version_B1_9.data.CreativeItemGetPacketData;
+import com.github.dirtpowered.releasetobeta.ReleaseToBeta;
+import com.github.dirtpowered.releasetobeta.network.session.BetaClientSession;
+import com.github.dirtpowered.releasetobeta.network.translator.model.ModernToBeta;
+import com.github.dirtpowered.releasetobeta.utils.item.ItemConverter;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientCreativeInventoryActionPacket;
+import com.github.steveice10.packetlib.Session;
+
+public class ClientCreativeInventoryActionTranslator implements ModernToBeta<ClientCreativeInventoryActionPacket> {
+
+    @Override
+    public void translate(ReleaseToBeta main, ClientCreativeInventoryActionPacket packet, Session modernSession, BetaClientSession betaSession) {
+        ItemStack itemStack = packet.getClickedItem();
+        if (itemStack == null)
+            return;
+
+        betaSession.sendPacket(new CreativeItemGetPacketData((short) packet.getSlot(), ItemConverter.itemStackToBetaItemStack(itemStack)));
+    }
+}