clean up

build.gradle

@@ -45,10 +45,16 @@ loom {
 }
 
 processResources {
-	inputs.property "version", project.version
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
+    def expandProps = [
+            "version": rootProject.mod_version,
+            "minecraft_version_range": rootProject.minecraft_version_range,
+    ]
+
+    filesMatching(["fabric.mod.json"]) {
+        expand expandProps
+    }
+
+    inputs.properties(expandProps)
 }
 
 tasks.withType(JavaCompile).configureEach {

gradle.properties

@@ -6,6 +6,8 @@ mod_version = 0.6.0+1.20
 maven_group = ru.pinkgoosik
 archives_base_name = artifality
 
+minecraft_version_range = >=1.20 <1.20.2
+
 # Dependencies
 minecraft_version = 1.20.1
 yarn_mappings = 1.20.1+build.10

src/main/java/artifality/block/CrateBlock.java

@@ -3,9 +3,7 @@
 import static artifality.registry.ArtifalityItems.*;
 
 import artifality.block.base.BaseBlock;
-import artifality.extension.ArtifactChances;
 import artifality.item.base.ArtifactItem;
-import artifality.list.ArtifactRarity;
 import artifality.registry.ArtifalityItems;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/artifality/item/ArtifactSettings.java

@@ -1,12 +1,10 @@
 package artifality.item;
 
-import artifality.list.ArtifactRarity;
 import dev.emi.trinkets.api.client.TrinketRenderer;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 
 public class ArtifactSettings {
     public final FabricItemSettings fabricItemSettings;
-    public ArtifactRarity rarity = ArtifactRarity.COMMON;
     public TrinketRenderer renderer;
     public boolean isCrateLoot = true;
     public boolean isTrinket = false;
@@ -19,11 +17,6 @@ public ArtifactSettings() {
         fabricItemSettings = new FabricItemSettings();
     }
 
-    public ArtifactSettings rarity(ArtifactRarity rarity) {
-        this.rarity = rarity;
-        return this;
-    }
-
     public ArtifactSettings nonCrateItem() {
         this.isCrateLoot = false;
         return this;

src/main/java/artifality/mixin/common/extension/LightningMixinExtension.java → src/main/java/artifality/mixin/common/LightningMixin.java

@@ -1,4 +1,4 @@
-package artifality.mixin.common.extension;
+package artifality.mixin.common;
 
 import artifality.extension.LightningExtension;
 import net.minecraft.entity.Entity;
@@ -11,13 +11,13 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LightningEntity.class)
-public abstract class LightningMixinExtension extends Entity implements LightningExtension {
+public abstract class LightningMixin extends Entity implements LightningExtension {
 
     private boolean artifality$canSpawnFire = true;
     private boolean artifality$canChargeCreeper = true;
     private float artifality$damage = 0;
 
-    public LightningMixinExtension(EntityType<?> type, World world) {
+    public LightningMixin(EntityType<?> type, World world) {
         super(type, world);
     }
 

src/main/java/artifality/registry/ArtifactConfigs.java

@@ -2,47 +2,39 @@
 
 import artifality.client.render.BalloonRenderer;
 import artifality.item.ArtifactSettings;
-import artifality.list.ArtifactRarity;
 
 public class ArtifactConfigs {
 
     public static final ArtifactSettings LUNAR_CRYSTAL_WAND = new ArtifactSettings()
             .maxCount(1)
-            .tiered()
-            .rarity(ArtifactRarity.RARE);
+            .tiered();
 
     public static final ArtifactSettings NATURE_STAFF = new ArtifactSettings()
             .maxCount(1)
-            .tiered()
-            .rarity(ArtifactRarity.COMMON);
+            .tiered();
 
     public static final ArtifactSettings ZEUS_STAFF = new ArtifactSettings()
             .maxCount(1)
-            .tiered()
-            .rarity(ArtifactRarity.LEGENDARY);
+            .tiered();
 
     public static final ArtifactSettings INVISIBILITY_CAPE = new ArtifactSettings()
             .maxCount(1)
             .trinket()
-            .tiered()
-            .rarity(ArtifactRarity.COMMON);
+            .tiered();
 
     public static final ArtifactSettings BALLOON = new ArtifactSettings()
             .maxDamage(128)
             .tiered()
             .trinket()
             .twoModeled()
-            .renderer(new BalloonRenderer())
-            .rarity(ArtifactRarity.RARE);
+            .renderer(new BalloonRenderer());
 
     public static final ArtifactSettings HAND_FAN = new ArtifactSettings()
             .maxCount(1)
-            .tiered()
-            .rarity(ArtifactRarity.RARE);
+            .tiered();
 
     public static final ArtifactSettings HAUNTING_SOUL = new ArtifactSettings()
             .maxCount(1)
             .tiered()
-            .trinket()
-            .rarity(ArtifactRarity.RARE);
+            .trinket();
 }

src/main/java/artifality/util/TooltipAppender.java

@@ -39,7 +39,7 @@ else if(item instanceof EnchantedBookItem) {
 
     private static boolean shiftPressed(List<Text> tooltip, Item item) {
         if(!Screen.hasShiftDown()) {
-            if(!(item instanceof EnchantedBookItem && FabricLoader.getInstance().isModLoaded("enchdesc"))) {
+            if(!(item instanceof EnchantedBookItem && (FabricLoader.getInstance().isModLoaded("enchdesc") || FabricLoader.getInstance().isModLoaded("idwtialsimmoedm")))) {
                 tooltip.add(Text.literal(""));
                 tooltip.add(Text.literal(ofKey("press_shift")).formatted(Formatting.GRAY));
             }

src/main/resources/artifality.mixins.json

@@ -14,7 +14,7 @@
     "common.TrackTargetGoalMixin",
     "common.VillagerMixin",
     "common.access.BeaconAccess",
-    "common.extension.LightningMixinExtension",
+    "common.LightningMixin",
     "common.extension.PlayerMixinExtension"
   ],
   "client": [

src/main/resources/fabric.mod.json

@@ -55,7 +55,7 @@
   "depends": {
     "fabricloader": "*",
     "fabric-api": "*",
-    "minecraft": ">=1.20 <1.20.2",
+    "minecraft": "${minecraft_version_range}",
     "java": ">=17",
     "trinkets": "*"
   }