fix stacking enchantments, fix dungeon loot having omega, fix village…

…rs trading omega
Draylar · Aug 10, 2020 · 59b834a · 59b834a
1 parent d4880a2
commit 59b834a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.16.1
 yarn_mappings=1.16.1+build.21
 loader_version=0.9.0+build.204
 # Mod Properties
-mod_version=1.0.1-beta
+mod_version=1.0.2-beta
 maven_group=draylar
 archives_base_name=into-the-omega
 # Dependencies

diff --git a/src/main/java/draylar/intotheomega/mixin/EnchantmentMixin.java b/src/main/java/draylar/intotheomega/mixin/EnchantmentMixin.java
@@ -80,4 +80,37 @@ public boolean isOmega() {
     public Enchantment getVanilla() {
         return me_vanilla;
     }
+
+    @Inject(
+            method = "isAvailableForEnchantedBookOffer",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void isAvailableForEnchantedBookOffer(CallbackInfoReturnable<Boolean> cir) {
+        if(isOmega()) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @Inject(
+            method = "isAvailableForRandomSelection",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void isAvailableForRandomSelection(CallbackInfoReturnable<Boolean> cir) {
+        if(isOmega()) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @Inject(
+            method = "canAccept",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void canAccept(Enchantment other, CallbackInfoReturnable<Boolean> cir) {
+        if(this.isOmega() && this.getVanilla().equals(other)) {
+            cir.setReturnValue(false);
+        }
+    }
 }
diff --git a/src/main/resources/intotheomega.accesswidener b/src/main/resources/intotheomega.accesswidener
@@ -8,4 +8,5 @@ accessible  method  net/minecraft/enchantment/SilkTouchEnchantment  <init>  (Lne
 accessible  method  net/minecraft/enchantment/UnbreakingEnchantment  <init>  (Lnet/minecraft/enchantment/Enchantment$Rarity;[Lnet/minecraft/entity/EquipmentSlot;)V
 accessible  method  net/minecraft/enchantment/LureEnchantment  <init>  (Lnet/minecraft/enchantment/Enchantment$Rarity;Lnet/minecraft/enchantment/EnchantmentTarget;[Lnet/minecraft/entity/EquipmentSlot;)V
 
-accessible class net/minecraft/enchantment/EnchantmentHelper$Consumer
+accessible class net/minecraft/enchantment/EnchantmentHelper$Consumer
+accessible class net/minecraft/village/TradeOffers$EnchantBookFactory