1.5 Ready

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.10.56'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -60,12 +60,11 @@ dependencies {
 	}
 
 	//modApi include("com.jab125:thonkutil-${project.thonkutil_version}")
-	modApi include("com.jab125:thonkutil-base-1.4.0+ee0434f8c8")
-	modApi include("com.jab125:thonkutil-capes-v1-1.0.2+f3406aacc8")
-	modApi include("com.jab125:thonkutil-potions-v0-1.2.5+e4c51c01c8")
-	modApi include("com.jab125:thonkutil-trades-v1-1.1.5+769eee82c8")
-	modImplementation "de.guntram.mcmod:crowdin-translate:1.4+1.18"
-	include "de.guntram.mcmod:crowdin-translate:1.4+1.18"
+	modApi include("com.jab125:thonkutil-base-1.5.1+31ad4eb1c8")
+	modApi include("com.jab125:thonkutil-capes-v1-1.2.2+befce073c8")
+	modRuntimeOnly("com.jab125:thonkutil-coords-v1-1.0.8+526fd6e5c8")
+	modApi include("com.jab125:thonkutil-potions-v0-1.3.1+befce073c8")
+	modApi include("com.jab125:thonkutil-trades-v1-1.1.8+d77526a2c8")
 }
 
 processResources {

src/main/java/com/jab125/util/tradehelper/UpgradedGoblinTradeIfInNotEnd.java

@@ -10,6 +10,8 @@
 
 import java.util.Random;
 
+
+// more of an easter egg
 public record UpgradedGoblinTradeIfInNotEnd(ItemStack offerStack, ItemStack paymentStack, ItemStack secondaryPaymentStack, int maxUses, int merchantExperience, int playerExperience, float priceMultiplier) implements TradeOffers.Factory {
     @Nullable
     @Override

src/main/java/net/hat/gt/GobT.java

@@ -2,34 +2,26 @@
 
 
 import com.jab125.limeappleboat.gobt.api.GobTEvents;
-import com.jab125.thonkutil.api.CapeItem;
-import com.jab125.thonkutil.util.Util;
 import com.jab125.util.tradehelper.TradeManager;
 import com.jab125.util.tradehelper.type.*;
-import de.guntram.mcmod.crowdintranslate.CrowdinTranslate;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.fabricmc.loader.api.FabricLoader;
 import net.hat.gt.config.GoblinTradersConfig;
 import net.hat.gt.init.*;
 import net.hat.gt.spawning.SpawnHandler;
 import net.minecraft.block.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Rarity;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 
 import static com.jab125.thonkutil.util.Util.isModInstalled;
@@ -46,7 +38,6 @@ public void onInitialize() {
         if (isModInstalled("requiem-api")) {
 
         }
-        CrowdinTranslate.downloadTranslations("goblin-traders-fabric", "goblintraders");
         AutoConfig.register(GoblinTradersConfig.class, Toml4jConfigSerializer::new);
         config = AutoConfig.getConfigHolder(GoblinTradersConfig.class).getConfig();
         TradeManager manager = TradeManager.instance();

src/main/java/net/hat/gt/compat/RequiemCompat.java

@@ -1,11 +1,6 @@
 package net.hat.gt.compat;
 
-import ladysnake.requiem.api.v1.RequiemApi;
 import ladysnake.requiem.api.v1.RequiemPlugin;
-import ladysnake.requiem.api.v1.entity.ability.*;
-import net.hat.gt.entities.GoblinTraderEntity;
-import net.hat.gt.init.ModEntities;
-import org.jetbrains.annotations.NotNull;
 
 public class RequiemCompat implements RequiemPlugin {
     private static void requiemCompat() {

src/main/resources/assets/goblintraders/lang/en_us.json

@@ -81,5 +81,6 @@
   "gamerule.goblinTradersSpawn": "Goblin Traders spawn",
   "gamerule.veinGoblinTradersSpawn": "Vein Goblin Traders spawn",
 
-  "goblintraders:tooltip.goblin_food": "Goblin Treat"
+  "goblintraders:tooltip.goblin_food": "Goblin Treat",
+  "goblintraders:tooltip.vein_goblin_food": "Vein Goblin Treat"
 }

src/main/resources/data/goblintraders/requiem/mob_items/healing/goblin_treat.json

@@ -0,0 +1,21 @@
+{
+  "schema_version": 1,
+  "priority": 100,
+  "enabled": true,
+  "tooltip": {
+    "translate": "goblintraders:tooltip.goblin_food",
+    "color": "dark_gray"
+  },
+  "mob": {
+    "type": "goblintraders:goblin_trader"
+  },
+  "override": {
+    "type": "requiem:healing",
+    "item": {
+      "tag": "goblintraders:goblin_trader_edibles"
+    },
+    "use_time": 32,
+    "cooldown": 150,
+    "usage": "eat_to_heal"
+  }
+}

src/main/resources/data/goblintraders/requiem/mob_items/healing/vein_goblin_treat.json

@@ -0,0 +1,21 @@
+{
+  "schema_version": 1,
+  "priority": 100,
+  "enabled": true,
+  "tooltip": {
+    "translate": "goblintraders:tooltip.vein_goblin_food",
+    "color": "dark_gray"
+  },
+  "mob": {
+    "type": "goblintraders:vein_goblin_trader"
+  },
+  "override": {
+    "type": "requiem:healing",
+    "item": {
+      "tag": "goblintraders:vein_goblin_trader_edibles"
+    },
+    "use_time": 32,
+    "cooldown": 150,
+    "usage": "eat_to_heal"
+  }
+}

src/main/resources/data/goblintraders/tags/entity_types/goblin_traders.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "goblintraders:goblin_trader",
+    "goblintraders:vein_goblin_trader",
+    {"id": "endgoblintraders:end_goblin_trader", "required": false}
+  ]
+}

src/main/resources/data/goblintraders/tags/items/goblin_trader_edibles.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:apple",
+    "minecraft:golden_apple",
+    "minecraft:enchanted_golden_apple"
+  ]
+}

src/main/resources/data/goblintraders/tags/items/vein_goblin_trader_edibles.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:carrot",
+    "minecraft:golden_carrot",
+    {"id": "endgoblintraders:enchanted_golden_carrot", "required": false}
+  ]
+}

src/main/resources/data/requiem/tags/entity_types/inventory/armor_banned.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#goblintraders:goblin_traders"
+  ]
+}

src/main/resources/data/requiem/tags/entity_types/inventory/inventory_carriers.json

@@ -1,7 +1,6 @@
 {
   "replace": false,
   "values": [
-    "goblintraders:goblin_trader",
-    "goblintraders:vein_goblin_trader"
+    "#goblintraders:goblin_traders"
   ]
 }

src/main/resources/data/requiem/tags/entity_types/inventory/item_users.json

@@ -1,7 +1,6 @@
 {
   "replace": false,
   "values": [
-    "goblintraders:goblin_trader",
-    "goblintraders:vein_goblin_trader"
+    "#goblintraders:goblin_traders"
   ]
 }

src/main/resources/data/requiem/tags/entity_types/inventory/supercrafters.json

@@ -1,7 +1,6 @@
 {
   "replace": false,
   "values": [
-    "goblintraders:goblin_trader",
-    "goblintraders:vein_goblin_trader"
+    "#goblintraders:goblin_traders"
   ]
 }