Fix fixed item frame not working

Author: Kenny-Hui

CONFIG.md

@@ -33,11 +33,11 @@ This section enforces the hunger range for all players, at a scale from 0 to 20.
 ### vanilla_mechanics
 This section contains configurations that overrides Vanilla Minecraft mechanics.
 
-| Key                         | Description                                                                                                |
-|-----------------------------|------------------------------------------------------------------------------------------------------------|
-| fixedItemFrame              | Whether all item frame in the world should be treated as fixed. (Same effect as {Fixed:1b} Entity NBT Tag) |
-| minItemFrameInteractOpLevel | The minimum OP Level required to be able to interact with item frame.                                      |
-| fallingBlockDelay           | How much tick it should take for falling block (i.e. Sand & Gravel) to start falling after placing.        |
+| Key                         | Description                                                                                         |
+|-----------------------------|-----------------------------------------------------------------------------------------------------|
+| immutableItemFrame          | Whether all item frame in the world should be non-destructible by nature except by players.         |
+| minItemFrameInteractOpLevel | The minimum OP Level required to be able to interact with item frame.                               |
+| fallingBlockDelay           | How much tick it should take for falling block (i.e. Sand & Gravel) to start falling after placing. |
 
 ### Welcome Message Object
 | Key        | Description                                                                                                                                       |

src/main/java/com/lx862/svrutil/feature/VanillaMechanicsFeature.java

@@ -4,7 +4,7 @@
 
 public class VanillaMechanicsFeature extends Feature {
     private int fallingBlockDelay = 2;
-    private boolean fixedItemFrame = false;
+    private boolean immutableItemFrame = false;
     private int minItemFrameInteractOpLevel = 0;
 
     public VanillaMechanicsFeature() {
@@ -15,15 +15,15 @@ public VanillaMechanicsFeature() {
     public void readConfig(JsonObject jsonObject) {
         super.readConfig(jsonObject);
         this.fallingBlockDelay = jsonObject.get("fallingBlockDelay").getAsInt();
-        this.fixedItemFrame = jsonObject.get("fixedItemFrame").getAsBoolean();
+        this.immutableItemFrame = jsonObject.get("immutableItemFrame").getAsBoolean();
         this.minItemFrameInteractOpLevel = jsonObject.get("minItemFrameInteractOpLevel").getAsInt();
     }
 
     @Override
     public JsonObject writeConfig() {
         JsonObject jsonObject = super.writeConfig();
         jsonObject.addProperty("fallingBlockDelay", fallingBlockDelay);
-        jsonObject.addProperty("fixedItemFrame", fixedItemFrame);
+        jsonObject.addProperty("immutableItemFrame", immutableItemFrame);
         jsonObject.addProperty("minItemFrameInteractOpLevel", minItemFrameInteractOpLevel);
         return jsonObject;
     }
@@ -32,8 +32,8 @@ public int getFallingBlockDelay() {
         return fallingBlockDelay;
     }
 
-    public boolean getFixedItemFrame() {
-        return fixedItemFrame;
+    public boolean getImmutableItemFrame() {
+        return immutableItemFrame;
     }
     public int getMinItemFrameInteractOpLevel() {
         return minItemFrameInteractOpLevel;

src/main/java/com/lx862/svrutil/mixin/ItemFrameMixin.java

@@ -24,14 +24,14 @@ protected ItemFrameMixin(EntityType<? extends AbstractDecorationEntity> entityTy
 
     @Inject(method = "canStayAttached", at = @At("HEAD"), cancellable = true)
     public void canStayAttached(CallbackInfoReturnable<Boolean> cir) {
-        if(FeatureSet.VANILLA_MECHANICS.feature.enabled && ((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getFixedItemFrame()) {
+        if(FeatureSet.VANILLA_MECHANICS.feature.enabled && ((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getImmutableItemFrame()) {
             cir.setReturnValue(true);
         }
     }
 
     @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
     public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-        if(FeatureSet.VANILLA_MECHANICS.feature.enabled && ((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getFixedItemFrame()) {
+        if(FeatureSet.VANILLA_MECHANICS.feature.enabled && ((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getImmutableItemFrame()) {
             if(source.isExplosive() || source.isProjectile()) {
                 cir.setReturnValue(false);
             }
@@ -41,7 +41,7 @@ public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boo
     @Inject(method = "interact", at = @At("HEAD"), cancellable = true)
     public void interact(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
         if(!player.getWorld().isClient() && FeatureSet.VANILLA_MECHANICS.feature.enabled) {
-            if(player.hasPermissionLevel(((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getMinItemFrameInteractOpLevel())) {
+            if(!player.hasPermissionLevel(((VanillaMechanicsFeature) FeatureSet.VANILLA_MECHANICS.feature).getMinItemFrameInteractOpLevel())) {
                 cir.setReturnValue(ActionResult.PASS);
             }
         }