remove experimental retribution enchantment (still a WIP!)

Team-Abode · Jul 30, 2023 · 0307a72 · 0307a72
1 parent c05e537
commit 0307a72
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/src/main/java/com/teamabode/guarding/Guarding.java b/src/main/java/com/teamabode/guarding/Guarding.java
@@ -35,11 +35,13 @@ public class Guarding implements ModInitializer {
  builder.addFloatProperty("additional_knockback_strength_per_level", 0.15f);
  return builder;
  })
+ /*
  .addGroup("retribution", builder -> {
  builder.addIntProperty("slowness_amplifier", 1);
  builder.addBooleanProperty("is_treasure", true);
  return builder;
  })
+ */
  .build();
 
  public void onInitialize() {

diff --git a/src/main/java/com/teamabode/guarding/common/enchantment/RetributionEnchantment.java b/src/main/java/com/teamabode/guarding/common/enchantment/RetributionEnchantment.java
@@ -22,7 +22,8 @@ public int getMaxLevel() {
  }
 
  public boolean isTreasureOnly() {
- return Guarding.CONFIG.getGroup("retribution").getBooleanProperty("is_treasure");
+ return false;
+ //return Guarding.CONFIG.getGroup("retribution").getBooleanProperty("is_treasure");
  }
 
  protected boolean checkCompatibility(Enchantment other) {

diff --git a/src/main/java/com/teamabode/guarding/core/init/GuardingCallbacks.java b/src/main/java/com/teamabode/guarding/core/init/GuardingCallbacks.java
@@ -24,7 +24,7 @@ public class GuardingCallbacks {
 
  public static void init() {
  GuardingEvents.SHIELD_BLOCKED.register(GuardingCallbacks::onShieldBlock);
- GuardingEvents.SHIELD_DISABLED.register(GuardingCallbacks::onShieldDisabled);
+ //GuardingEvents.SHIELD_DISABLED.register(GuardingCallbacks::onShieldDisabled);
  }
 
  // Logic for blocking
@@ -99,6 +99,7 @@ private static void tryParryEffects(Player user, Entity sourceEntity, boolean is
 
  // Handles the code for the Retribution Enchantment
  private static void onShieldDisabled(Player user, LivingEntity attacker) {
+ /*
  ItemStack useItem = user.getUseItem();
  int retributionLevel = EnchantmentHelper.getItemEnchantmentLevel(GuardingEnchantments.RETRIBUTION, useItem);
  int amplifier = Guarding.CONFIG.getGroup("retribution").getIntProperty("slowness_amplifier");
@@ -110,6 +111,7 @@ private static void onShieldDisabled(Player user, LivingEntity attacker) {
  livingEntity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, retributionLevel * 50, amplifier, true, true));
  }
  }
+ */
  }
 
  // The condition for retribution to apply

diff --git a/src/main/java/com/teamabode/guarding/core/init/GuardingEnchantments.java b/src/main/java/com/teamabode/guarding/core/init/GuardingEnchantments.java
@@ -12,7 +12,6 @@
 public class GuardingEnchantments {
  public static final Enchantment BARBED = register("barbed", new BarbedEnchantment());
  public static final Enchantment PUMMELING = register("pummeling", new PummelingEnchantment());
- public static final Enchantment RETRIBUTION = register("retribution", new RetributionEnchantment());
 
  private static <E extends Enchantment> E register(String name, E enchantment) {
  return Registry.register(BuiltInRegistries.ENCHANTMENT, new ResourceLocation(Guarding.MOD_ID, name), enchantment);

diff --git a/src/main/java/com/teamabode/guarding/core/mixin/api/NetheriteShieldMixin.java b/src/main/java/com/teamabode/guarding/core/mixin/api/NetheriteShieldMixin.java
@@ -64,24 +64,4 @@ private void disableNetheriteShield(boolean becauseOfAxe, CallbackInfo ci) {
  this.level().broadcastEntityEvent(this, (byte)30);
  }
  }
-
- @Shadow
- public Iterable<ItemStack> getArmorSlots() {
- return null;
- }
-
- @Shadow
- public ItemStack getItemBySlot(EquipmentSlot slot) {
- return null;
- }
-
- @Shadow
- public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
-
- }
-
- @Shadow
- public HumanoidArm getMainArm() {
- return null;
- }
 }