Removed onlyGolemOwnerFriendly gamerule

Max094Reikeb · Apr 22, 2022 · 272e4ee · 272e4ee
1 parent e212f7e
commit 272e4ee
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 223 deletions.
diff --git a/src/main/java/net/reikeb/notenoughgamerules/Gamerules.java b/src/main/java/net/reikeb/notenoughgamerules/Gamerules.java
@@ -30,7 +30,6 @@ public class Gamerules {
     public static GameRules.Key<GameRules.BooleanRule> KEEP_XP;
     public static GameRules.Key<GameRules.IntRule> LIGHTNING_DAMAGE;
     public static GameRules.Key<GameRules.IntRule> NATURAL_HUNGER;
-    public static GameRules.Key<GameRules.BooleanRule> ONLY_GOLEMS_OWNER_FRIENDLY;
     public static GameRules.Key<GameRules.IntRule> POISON_HEALTH;
     public static GameRules.Key<GameRules.BooleanRule> PVP;
     public static GameRules.Key<GameRules.IntRule> RAW_MEAT_HUNGER;
@@ -62,7 +61,6 @@ public static void setupGamerules() {
         KEEP_XP = GameRuleRegistry.register("keepXp", GameRules.Category.PLAYER, GameRuleFactory.createBooleanRule(false));
         LIGHTNING_DAMAGE = GameRuleRegistry.register("lightningDamage", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(-1));
         NATURAL_HUNGER = GameRuleRegistry.register("naturalHunger", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(-1));
-        ONLY_GOLEMS_OWNER_FRIENDLY = GameRuleRegistry.register("onlyGolemsOwnerFriendly", GameRules.Category.MOBS, GameRuleFactory.createBooleanRule(false));
         POISON_HEALTH = GameRuleRegistry.register("poisonHealth", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(1));
         PVP = GameRuleRegistry.register("pvp", GameRules.Category.PLAYER, GameRuleFactory.createBooleanRule(true));
         RAW_MEAT_HUNGER = GameRuleRegistry.register("rawMeatHunger", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(30));

diff --git a/src/main/java/net/reikeb/notenoughgamerules/IronGolemInterface.java b/src/main/java/net/reikeb/notenoughgamerules/IronGolemInterface.java
diff --git a/src/main/java/net/reikeb/notenoughgamerules/mixin/blocks/CarvedPumpkinBlockMixin.java b/src/main/java/net/reikeb/notenoughgamerules/mixin/blocks/CarvedPumpkinBlockMixin.java
diff --git a/src/main/java/net/reikeb/notenoughgamerules/mixin/entities/TargetPredicateMixin.java b/src/main/java/net/reikeb/notenoughgamerules/mixin/entities/TargetPredicateMixin.java
diff --git a/...main/java/net/reikeb/notenoughgamerules/mixin/entities/iron_golem/IronGolemGoalMixin.java b/...main/java/net/reikeb/notenoughgamerules/mixin/entities/iron_golem/IronGolemGoalMixin.java
diff --git a/src/main/java/net/reikeb/notenoughgamerules/mixin/entities/iron_golem/IronGolemMixin.java b/src/main/java/net/reikeb/notenoughgamerules/mixin/entities/iron_golem/IronGolemMixin.java
diff --git a/src/main/resources/assets/not_enough_gamerules/lang/en_us.json b/src/main/resources/assets/not_enough_gamerules/lang/en_us.json
@@ -40,8 +40,6 @@
   "gamerule.keepXp.description": "Keeps only player's experience after death",
   "gamerule.lightningDamage": "Deal lightning damage",
   "gamerule.naturalHunger": "Food degeneration",
-  "gamerule.onlyGolemsOwnerFriendly": "Iron Golems owner friendly",
-  "gamerule.onlyGolemsOwnerFriendly.description": "Defines if Iron Golems spawned by a player also attacks other players except its owner",
   "gamerule.poisonHealth": "Poison health",
   "gamerule.poisonHealth.description": "Number of life points let by poison effect",
   "gamerule.pvp": "PVP",

diff --git a/src/main/resources/not_enough_gamerules.mixins.json b/src/main/resources/not_enough_gamerules.mixins.json
@@ -9,7 +9,6 @@
     "EnderDragonFightMixin",
     "ServerWorldMixin",
     "StatusEffectMixin",
-    "blocks.CarvedPumpkinBlockMixin",
     "blocks.CoralBlockBlockMixin",
     "blocks.CoralBlockMixin",
     "blocks.CoralFanMixin",
@@ -22,13 +21,10 @@
     "entities.EntityMixin",
     "entities.FoxBreadMixin",
     "entities.HoglinMixin",
-    "entities.iron_golem.IronGolemGoalMixin",
-    "entities.iron_golem.IronGolemMixin",
     "entities.LivingEntityMixin",
     "entities.MobEntityMixin",
     "entities.PiglinMixin",
     "entities.PigMixin",
-    "entities.TargetPredicateMixin",
     "entities.TntEntityMixin",
     "entities.TntMinecartEntityMixin",
     "entities.VillagerMixin",