Remove mxshieldv reference from 1.20.1 (1.4.9|20)

+ reset publish flag after failed attempt

Author: pnk2u

CHANGELOG.md

@@ -1,4 +1,4 @@
-<!--publish=true-->
+<!--publish=false-->
 ### 1.4.9:
 - Fix crash when used with [More Bed Variants](https://www.modrinth.com/mod/more-bed-variants) `2.1.0⁺`
 - Fix recipe unlocking for _Stick Variant_ compatibility recipes for [Nemo's Campfires](https://www.modrinth.com/mod/nemos-campfires) and improve the ones for [More Grindstone Variants](https://www.modrinth.com/mod/more-grindstone-variants)

build.gradle

@@ -130,8 +130,6 @@ dependencies {
 		modCompileOnly "maven.modrinth:more-fletching-tables:${project.mfletchingtablev_version_id}"
 		// More Shield Variants
 		modCompileOnly "maven.modrinth:more-shield-variants:${project.mshieldv_version_id}"
-			// More Extra Shield Variants
-			modCompileOnly "maven.modrinth:more-extra-shield-variants:${project.mxshieldv_version_id}"
 		// More Bed Variants
 		modCompileOnly "maven.modrinth:more-bed-variants:${project.mbedv_version_id}"
 		// More Bookshelf Variants

src/main/java/de/pnku/mstv_base/trade/MstvVillagerTrades.java

@@ -1,6 +1,5 @@
 package de.pnku.mstv_base.trade;
 
-import de.pnku.shields_mxsv.item.MoreExtraShieldVariantItems;
 import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.RandomSource;
@@ -49,7 +48,6 @@ public class MstvVillagerTrades {
     public static boolean isMFishingRodVLoaded = false;
     public static boolean isNemosCampfireVLoaded = false;
     public static boolean isMShieldVLoaded = false;
-    public static boolean isMXShieldVLoaded = false;
     public static boolean isMBedVLoaded = false;
     public static boolean isMBookshelfVLoaded = false;
 
@@ -66,7 +64,7 @@ public static void initMstvTradeRegistration() {
         if (isMFrameVLoaded) registerMframevTrades();
         if (isMFishingRodVLoaded) registerMfrodvTrades();
         if (isNemosCampfireVLoaded) registerNemocampfirevTrades();
-        if (isMShieldVLoaded) registerMshieldvTrades(isMXShieldVLoaded);
+        if (isMShieldVLoaded) registerMshieldvTrades();
         if (isMBedVLoaded) registerMbedvTrades();
         if (isMBookshelfVLoaded) registerMbookshelfvTrades();
     }
@@ -208,16 +206,11 @@ private static void registerNemocampfirevTrades(){
         replacedTrades.add(CAMPFIRE);
     }
 
-    private static void registerMshieldvTrades(boolean isMXShieldVLoaded){
+    private static void registerMshieldvTrades(){
       // Armorer
         // Shield Sell
-        if (!isMXShieldVLoaded){
-            LOGGER.info("Registering mShieldV VillagerTrades");
-            registerBiomeSpecificSellOffers(ARMORER, 3, 5, 1, 10, 12, highMod, false, new Item[]{ACACIA_SHIELD, OAK_SHIELD, DARK_OAK_SHIELD, JUNGLE_SHIELD, SHIELD});
-        } else {
-            LOGGER.info("Registering mXShieldV VillagerTrades");
-            registerBiomeSpecificSellOffers(ARMORER, 3, 5, 1, 10, 12, highMod, false, new Item[]{MoreExtraShieldVariantItems.ACACIA_SHIELD, MoreExtraShieldVariantItems.OAK_SHIELD, MoreExtraShieldVariantItems.DARK_OAK_SHIELD, MoreExtraShieldVariantItems.JUNGLE_SHIELD, SHIELD});
-        }
+        LOGGER.info("Registering mShieldV VillagerTrades");
+        registerBiomeSpecificSellOffers(ARMORER, 3, 5, 1, 10, 12, highMod, false, new Item[]{ACACIA_SHIELD, OAK_SHIELD, DARK_OAK_SHIELD, JUNGLE_SHIELD, SHIELD});
 
         replacedTrades.add(SHIELD);
     }
@@ -354,7 +347,6 @@ private static void init(){
         isMFishingRodVLoaded = isLoaded("mstv-mfrv");
         isNemosCampfireVLoaded = isLoaded("nemos-campfires");
         isMShieldVLoaded = isLoaded("lolmsv");
-        isMXShieldVLoaded = isLoaded("shields-mxsv");
         isMBedVLoaded = isLoaded("quad-lolmbdv");
         isMBookshelfVLoaded = isLoaded("lolmbv");
     }