update to hotfix2

scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs

@@ -1,6 +1,6 @@
 #modloaded astralsorcery
 #loader mixin
-#clientonly
+#sideonly client
 
 import native.hellfirepvp.astralsorcery.client.ClientScheduler;
 import native.net.minecraft.client.renderer.BufferBuilder;
@@ -140,4 +140,4 @@ zenClass AstralRelayHalo_RenderTranslucentItem {
         GlStateManager.enableTexture2D();
         GlStateManager.popMatrix();
     }
-}
+}

scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs

@@ -1,5 +1,6 @@
 #modloaded astralsorcery
 #loader mixin
+#sideonly client
 
 import native.hellfirepvp.astralsorcery.common.tile.TileAttunementRelay;
 
@@ -56,4 +57,4 @@ zenClass MixinTESRAttunementRelay_RenderFix {
         // Fully replace original method body
         ci.cancel();
     }
-}
+}

scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.zs

@@ -46,4 +46,4 @@ zenClass MixinBlockAttunementRelay_OnActivateGuard {
         if (!current.isEmpty() && ItemStack.areItemsEqual(current, held) && ItemStack.areItemStackTagsEqual(current, held))
             cir.setReturnValue(true);
     }
-}
+}

scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs

@@ -1,6 +1,6 @@
 #modloaded bewitchment
 #loader mixin
-#clientonly
+#sideonly client
 
 import native.mezz.jei.api.IModRegistry;
 import native.mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;

scripts/mixin/AllowQueenImprinting.zs

@@ -2,16 +2,21 @@
 #loader mixin
 
 import native.net.minecraft.item.ItemStack;
+import native.net.minecraft.nbt.NBTTagCompound;
 import native.forestry.api.genetics.AlleleManager;
+import native.forestry.api.apiculture.BeeManager;
+import native.forestry.api.apiculture.EnumBeeType;
 import native.net.bdew.gendustry.machines.imprinter.TileImprinter;
 import native.net.bdew.gendustry.items.GeneTemplate;
 
+import mixin.CallbackInfo;
 import mixin.CallbackInfoReturnable;
 
 // Allow putting a Queen into the Genetic Imprinter, instead of only Princess or Drone
 #mixin {targets: "net.bdew.gendustry.machines.imprinter.TileImprinter"}
 zenClass AllowQueenImprinting {
 
+    // Overrides the slot validation, to allow queens to be inserted into the imprinter
     // SRG HEAD: TileEntity#isItemValidForSlot -> func_94041_b)
     #mixin Inject
     #{
@@ -31,4 +36,23 @@ zenClass AllowQueenImprinting {
             cir.setReturnValue(true);
         }
     }
+
+    // The imprinter only overwrites 1 genome, but queens need both genomes set.
+    #mixin Inject
+    #{
+    #    method: "doStart",
+    #    at: { value: "HEAD" },
+    #    cancellable: true
+    #}
+    function ensureBothGenomes(bee as ItemStack, ci as CallbackInfo) as void {
+        val self as TileImprinter = this as TileImprinter;
+
+        val individual = AlleleManager.alleleRegistry.getIndividual(bee);
+
+        // getType(ItemStack) fails because of ZS, so we use isMated and isDrone as Queen detection
+        if (individual != null && BeeManager.beeRoot.isMated(bee) && !BeeManager.beeRoot.isDrone(bee)) {
+            val tag as NBTTagCompound = bee.getTagCompound();
+            tag.setTag("Mate", tag.getCompoundTag("Genome"));
+        }
+    }
 }

scripts/mixin/LastStandrework/LastStandFormula.txt

@@ -1,20 +0,0 @@
-#loader mixin
-
-import mixin.CallbackInfo;
-import native.openblocks.enchantments.LastStandEnchantmentsHandler;
-
-
-#mixin Mixin
-#{targets: "openblocks.enchantments.LastStandEnchantmentsHandler"}
-zenClass MixinLastStandEnchantmentsHandler  {
-  #mixin ModifyConstant
-  #{
-  #  method: "lambda$onLivingHurt$0",
-  #  constant: {intValue: 50}
-  #}
-  function changelaststandflatmultiplier(value as int) as int {
-    return 400;
-  }
-}
-
-

scripts/mixin/LastStandrework/LastStandFormula.zs

@@ -0,0 +1,16 @@
+#modloaded openblocks
+#loader mixin
+
+#mixin {value: "openblocks.enchantments.LastStandEnchantmentsHandler"}
+zenClass MixinLastStandEnchantmentsHandler  {
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "lambda$onHurt$1",
+  #  constant: {floatValue: 50.0}
+  #}
+  function mbc_modify_xpRequiredFlat(original as float) as float {
+    return 400.0f;
+  }
+}
+

scripts/mixin/iceandfireweapons/tidetrident.txt

@@ -1,17 +0,0 @@
-#loader mixin
-
-import mixin.CallbackInfo;
-import native.com.github.alexthe666.iceandfire.entity.EntityTideTrident;
-
-#mixin Mixin
-#{targets: "com.github.alexthe666.iceandfire.entity.EntityTideTrident"}
-zenClass MixinEntityTideTrident {
-    #mixin ModifyConstant
-    #{
-    #  method: "EntityTideTrident",
-    #  constant: {doubleValue: 6.0D}
-    #}
-    function ChangeTideTridentdamage(existing as double) as double {
-        return 35.0 as double;
-    }
-}

scripts/mixin/iceandfireweapons/tidetrident.zs

@@ -0,0 +1,14 @@
+#modloaded iceandfire
+#loader mixin
+
+#mixin {value: "com.github.alexthe666.iceandfire.entity.EntityTideTrident"}
+zenClass MixinEntityTideTrident {
+    #mixin ModifyConstant
+    #{
+    #  method: "<init>",
+    #  constant: {doubleValue: 6.0D}
+    #}
+    function mbc_modify_dmg_TideTrident(original as double) as double {
+        return 35.0d;
+    }
+}