Port to 1.18.2.

Author: Darkhax

.gitignore

@@ -1,21 +1,22 @@
-#IntelliJ IDEA
-*.class
-*.iml
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
 *.ipr
 *.iws
-out/
+*.iml
+.idea
 
-#ForgeGradle
-build/
-.gradle/
-run/
-/libs
-/logs
+# gradle
+build
+.gradle
 
-#Eclipse
-.classpath
-.metadata/
-.project
-.settings/
-*.launch
-/bin/
+# other
+eclipse
+run

Common/build.gradle

@@ -0,0 +1,71 @@
+plugins {
+    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
+}
+
+apply from: '../gradle/property_helper.gradle'
+
+archivesBaseName = "${mod_name}-Common-${minecraft_version}"
+
+minecraft {
+    version(minecraft_version)
+}
+
+dependencies {
+    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+    compileOnly group: 'net.darkhax.bookshelf', name:'Bookshelf-Common-1.18.2', version: project.ext.bookshelf_version
+    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+}
+
+processResources {
+
+    def buildProps = project.properties.clone()
+
+    filesMatching(['pack.mcmeta']) {
+
+        expand buildProps
+    }
+}
+
+// -- MAVEN PUBLISHING --
+project.publishing {
+
+    publications {
+
+        mavenJava(MavenPublication) {
+
+            artifactId project.archivesBaseName
+
+            // Base mod archive.
+            artifact jar
+
+            // Adds the sources as an artifact.
+            artifact project.sourcesJar {
+                classifier 'sources'
+            }
+
+            // Adds the javadocs as an artifact.
+            artifact project.javadocJar {
+                classifier 'javadoc'
+            }
+        }
+    }
+
+    repositories {
+
+        maven {
+
+            // Sets maven credentials if they are provided. This is generally
+            // only used for external/remote uploads.
+            if (project.hasProperty('mavenUsername') && project.hasProperty('mavenPassword')) {
+
+                credentials {
+
+                    username findProperty('mavenUsername')
+                    password findProperty('mavenPassword')
+                }
+            }
+
+            url getDefaultString('mavenURL', 'undefined', true)
+        }
+    }
+}

Common/src/main/java/net/darkhax/additionalbanners/AdditionalBanners.java

@@ -0,0 +1,13 @@
+package net.darkhax.additionalbanners;
+
+import net.darkhax.bookshelf.api.Services;
+
+public class AdditionalBanners {
+
+    public static final String MOD_ID = "additionalbanners";
+
+    public AdditionalBanners() {
+
+        Services.REGISTRIES.loadContent(new Content());
+    }
+}

Common/src/main/java/net/darkhax/additionalbanners/BannerPatterns.java

@@ -0,0 +1,66 @@
+package net.darkhax.additionalbanners;
+
+import net.darkhax.bookshelf.api.function.CachedSupplier;
+import net.minecraft.world.item.Rarity;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public class BannerPatterns {
+
+    public static final Map<String, PatternData> PATTERNS = new HashMap<>();
+
+    private static final String MOD_ID = "additionalbanners";
+    private static final String COMMON = "COMMON";
+    private static final String UNCOMMON = "UNCOMMON";
+    private static final String RARE = "RARE";
+    private static final String EPIC = "EPIC";
+
+    public static final PatternData ANCHOR = createPattern("anchor", COMMON);
+    public static final PatternData BALANCE = createPattern("balance", COMMON);
+    public static final PatternData GRASS = createPattern("grass", COMMON);
+    public static final PatternData KELP = createPattern("kelp", COMMON);
+    public static final PatternData MUSHROOM = createPattern("mushroom", COMMON);
+    public static final PatternData PUMPKIN = createPattern("pumpkin", COMMON);
+    public static final PatternData SNOWFLAKE = createPattern("snowflake", COMMON);
+
+    public static final PatternData SQUID = createPattern("squid", UNCOMMON);
+    public static final PatternData SHIELD = createPattern("shield", UNCOMMON);
+    public static final PatternData SWORD = createPattern("sword", UNCOMMON);
+    public static final PatternData FRAME = createPattern("frame", UNCOMMON);
+    public static final PatternData HEX = createPattern("hex", UNCOMMON);
+
+    public static final PatternData DRAGON = createPattern("dragon", RARE);
+    public static final PatternData PHANTOM = createPattern("phantom", RARE);
+    public static final PatternData TRIDENT = createPattern("trident", RARE);
+
+    public static final PatternData CLUBS = createPattern("clubs", EPIC);
+    public static final PatternData DIAMOND = createPattern("diamond", EPIC);
+    public static final PatternData HEART = createPattern("heart", EPIC);
+    public static final PatternData SPADES = createPattern("spades", EPIC);
+    public static final PatternData MOON = createPattern("moon", EPIC);
+    public static final PatternData SQUARES = createPattern("squares", EPIC);
+
+    private static PatternData createPattern(String name, String rarity) {
+
+        final PatternData pattern = new PatternData(name, rarity);
+        PATTERNS.put(name, pattern);
+        return pattern;
+    }
+
+    public static class PatternData {
+
+        public final String name;
+        public final CachedSupplier<Rarity> rarity;
+        public final String enumName;
+        public final String texture;
+
+        public PatternData(String name, String rarity) {
+            this.name = name;
+            this.rarity = CachedSupplier.cache(() -> Rarity.valueOf(rarity));
+            this.texture = MOD_ID + "_" + this.name;
+            this.enumName = this.texture.toUpperCase(Locale.ROOT);
+        }
+    }
+}

Common/src/main/java/net/darkhax/additionalbanners/Content.java

@@ -0,0 +1,37 @@
+package net.darkhax.additionalbanners;
+
+import net.darkhax.bookshelf.api.entity.merchant.MerchantTier;
+import net.darkhax.bookshelf.api.entity.merchant.trade.VillagerSells;
+import net.darkhax.bookshelf.api.registry.IRegistryObject;
+import net.darkhax.bookshelf.api.registry.RegistryDataProvider;
+import net.minecraft.world.entity.npc.VillagerProfession;
+import net.minecraft.world.item.BannerPatternItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.entity.BannerPattern;
+
+public class Content extends RegistryDataProvider {
+
+    public Content() {
+
+        super(AdditionalBanners.MOD_ID);
+
+        this.withCreativeTab(() -> Items.CREEPER_BANNER_PATTERN);
+
+        for (BannerPatterns.PatternData pattern : BannerPatterns.PATTERNS.values()) {
+
+            final IRegistryObject<BannerPatternItem> stencilItem = this.items.add(() -> new BannerPatternItem(BannerPattern.valueOf(pattern.enumName), new Item.Properties().rarity(pattern.rarity.get()).stacksTo(1)), pattern.name);
+
+            switch (pattern.rarity.get()) {
+
+                case COMMON -> this.trades.addCommonWanderingTrade(VillagerSells.create(stencilItem, 8, 8, 1, 0.5f));
+                case UNCOMMON -> this.trades.addCommonWanderingTrade(VillagerSells.create(stencilItem, 12, 8, 1, 0.5f));
+                case RARE -> this.trades.addRareWanderingTrade(VillagerSells.create(stencilItem, 16, 8, 1, 0.5f));
+                case EPIC -> {
+                    this.trades.addTrade(VillagerProfession.SHEPHERD, MerchantTier.EXPERT, VillagerSells.create(stencilItem, 18, 8, 1, 0.5f));
+                    this.trades.addRareWanderingTrade(VillagerSells.create(stencilItem, 24, 8, 1, 0.5f));
+                }
+            }
+        }
+    }
+}

src/main/resources/assets/additionalbanners/lang/en_us.json renamed to Common/src/main/resources/assets/additionalbanners/lang/en_us.json

@@ -1,5 +1,5 @@
 {
-  "itemGroup.additionalbanners": "Add. Banners",
+  "itemGroup.additionalbanners.creative_tab": "Add. Banners",
 
   "item.additionalbanners.anchor": "Banner Pattern",
   "item.additionalbanners.anchor.desc": "Anchor",