remove Witchskall to be compatible

Derican · Apr 22, 2022 · 9761fbc · 9761fbc
1 parent 74cafe0
commit 9761fbc
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 379 deletions.
diff --git a/build.gradle b/build.gradle
@@ -134,7 +134,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.5-36.2.20'
+    minecraft 'net.minecraftforge:forge:1.16.5-36.2.34'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..

diff --git a/src/main/java/iskallia/vault/easteregg/Witchskall.java b/src/main/java/iskallia/vault/easteregg/Witchskall.java
diff --git a/src/main/java/iskallia/vault/init/ModSounds.java b/src/main/java/iskallia/vault/init/ModSounds.java
@@ -53,7 +53,6 @@ public class ModSounds {
     public static SoundEvent VAULT_CHEST_EPIC_OPEN;
     public static SoundEvent VAULT_CHEST_OMEGA_OPEN;
     public static SoundEvent VAULT_CHEST_RARE_OPEN;
-    public static SoundEvent WITCHSKALL_IDLE;
     public static SoundEvent FAVOUR_UP;
     public static LazySoundType VAULT_GEM;
 
@@ -104,7 +103,6 @@ public static void registerSounds(final RegistryEvent.Register<SoundEvent> event
         ModSounds.VAULT_CHEST_EPIC_OPEN = registerSound(event, "vault_chest_epic_open");
         ModSounds.VAULT_CHEST_OMEGA_OPEN = registerSound(event, "vault_chest_omega_open");
         ModSounds.VAULT_CHEST_RARE_OPEN = registerSound(event, "vault_chest_rare_open");
-        ModSounds.WITCHSKALL_IDLE = registerSound(event, "witchskall_idle");
         ModSounds.FAVOUR_UP = registerSound(event, "favour_up");
     }
 

diff --git a/src/main/java/iskallia/vault/mixin/MixinWitchEntity.java b/src/main/java/iskallia/vault/mixin/MixinWitchEntity.java
diff --git a/src/main/java/iskallia/vault/mixin/MixinWitchRenderer.java b/src/main/java/iskallia/vault/mixin/MixinWitchRenderer.java
diff --git a/src/main/java/iskallia/vault/util/data/WeightedList.java b/src/main/java/iskallia/vault/util/data/WeightedList.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nullable;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 
@@ -25,6 +26,19 @@ public WeightedList<T> add(final T value, final int weight) {
         return this;
     }
 
+    public WeightedList<T> addOne(T value){
+        AtomicBoolean flag= new AtomicBoolean(false);
+        this.entries.forEach(tEntry -> {
+            if(tEntry.value==value) {
+                tEntry.weight += 1;
+                flag.set(true);
+            }
+        });
+        if(!flag.get())
+            this.add(new Entry<>(value,1));
+        return this;
+    }
+
     @Override
     public int size() {
         return this.entries.size();

diff --git a/src/main/java/iskallia/vault/world/gen/structure/VaultJigsawHelper.java b/src/main/java/iskallia/vault/world/gen/structure/VaultJigsawHelper.java
@@ -171,6 +171,8 @@ private static WeightedList<JigsawPiece> getRoomList(final ResourceLocation key)
         final JigsawPattern roomPool = getPool(key);
         final WeightedList<JigsawPiece> pool = new WeightedList<JigsawPiece>();
 //        roomPool.rawTemplates.forEach(weightedPiece -> pool.add(weightedPiece.getFirst(), (int) weightedPiece.getSecond()));
+//        TODO: check if the following overwrite is runnable
+        roomPool.getShuffledTemplates(rand).forEach(pool::addOne);
         return pool;
     }
 

diff --git a/src/main/resources/assets/the_vault/sounds.json b/src/main/resources/assets/the_vault/sounds.json
@@ -118,23 +118,6 @@
       "the_vault:treasure_goblin/idle_3"
     ]
   },
-  "witchskall_idle": {
-    "category": "neutral",
-    "sounds": [
-      {
-        "name": "the_vault:witchskall/idle",
-        "pitch": 1.00
-      },
-      {
-        "name": "the_vault:witchskall/idle",
-        "pitch": 0.95
-      },
-      {
-        "name": "the_vault:witchskall/idle",
-        "pitch": 1.05
-      }
-    ]
-  },
   "puzzle_completion_major": {
     "category": "master",
     "sounds": [

diff --git a/src/main/resources/assets/the_vault/the_vault.mixins.json b/src/main/resources/assets/the_vault/the_vault.mixins.json
@@ -35,8 +35,7 @@
       "MixinSingleJigsawPiece",
       "MixinSlot",
       "MixinStructureBlockTileEntity",
-      "MixinStructureProcessor",
-      "MixinWitchEntity"
+      "MixinStructureProcessor"
     ],
     "client": [
         "MixinAnvilScreen",
@@ -47,8 +46,7 @@
         "MixinEnchantedBookItem",
         "MixinItem",
         "MixinItemStackClient",
-        "MixinLivingRenderer",
-        "MixinWitchRenderer"
+        "MixinLivingRenderer"
     ],
     "server": [],
     "injectors": {

diff --git a/src/main/resources/data/the_vault/worldgen/processor_list/lakes/hanging_large.json b/src/main/resources/data/the_vault/worldgen/processor_list/lakes/hanging_large.json
@@ -2,19 +2,6 @@
   "processors": [
 	{
 	  "rules": [
-        {
-          "output_state": {
-            "Name": "minecraft:dead_bush"
-          },
-          "input_predicate": {
-            "predicate_type": "minecraft:random_block_match",
-            "block": "byg:firecracker_flower_bush",
-			"probability": 0.5
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          }
-        },
 		{
           "output_state": {
             "Name": "minecraft:light_gray_terracotta"

diff --git a/src/main/resources/data/the_vault/worldgen/processor_list/pirate_cove/pallet4.json b/src/main/resources/data/the_vault/worldgen/processor_list/pirate_cove/pallet4.json
@@ -277,22 +277,6 @@
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
           }
-        },
-        {
-          "output_state": {
-            "Name": "byg:stripped_palm_wood",
-            "Properties": {
-              "axis": "y"
-            }
-          },
-          "input_predicate": {
-            "predicate_type": "minecraft:random_block_match",
-            "block": "minecraft:stripped_oak_wood",
-            "probability": 1.0
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          }
         }
       ],
       "processor_type": "minecraft:rule"

diff --git a/src/main/resources/data/the_vault/worldgen/processor_list/treasure/pallet4.json b/src/main/resources/data/the_vault/worldgen/processor_list/treasure/pallet4.json
@@ -150,27 +150,6 @@
             "predicate_type": "minecraft:always_true"
           }
         },
-        {
-          "output_state": {
-            "Name": "byg:polished_soapstone_wall",
-            "Properties": {
-              "east": "none",
-              "north": "none",
-              "south": "none",
-              "up": "true",
-              "waterlogged": "false",
-              "west": "none"
-            }
-          },
-          "input_predicate": {
-            "predicate_type": "minecraft:random_block_match",
-            "block": "minecraft:cobblestone_wall",
-            "probability": 1.0
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          }
-        },
         {
           "output_state": {
             "Name": "minecraft:damaged_anvil",

diff --git a/src/main/resources/data/the_vault/worldgen/processor_list/treasure/pallet5.json b/src/main/resources/data/the_vault/worldgen/processor_list/treasure/pallet5.json
@@ -86,19 +86,6 @@
             "predicate_type": "minecraft:always_true"
           }
         },
-        {
-          "output_state": {
-            "Name": "byg:black_chiseled_sandstone"
-          },
-          "input_predicate": {
-            "predicate_type": "minecraft:random_block_match",
-            "block": "minecraft:chiseled_stone_bricks",
-            "probability": 1.0
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          }
-        },
         {
           "output_state": {
             "Name": "minecraft:polished_diorite"