diff --git a/.classpath b/.classpath
index d1a057074..43978c38d 100644
--- a/.classpath
+++ b/.classpath
@@ -2,46 +2,42 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
diff --git a/gradle.properties b/gradle.properties
index 87a983237..35c6bc5f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ package_group=gottsch
# use alpha, beta, or v (for version)
mod_version_type=
-mod_version=3.1.0
+mod_version=3.1.1
#versions
mc_version=1.18.2
diff --git a/src/generated/resources/assets/treasure2/lang/en_us.json b/src/generated/resources/assets/treasure2/lang/en_us.json
index 9e34d97cb..37127928f 100644
--- a/src/generated/resources/assets/treasure2/lang/en_us.json
+++ b/src/generated/resources/assets/treasure2/lang/en_us.json
@@ -61,6 +61,11 @@
"chat.treasure2.key.key_break": "Your key broke whilst attempting to unlock the lock!",
"chat.treasure2.key.key_not_fit": "Your key doesn't fit the lock!",
"chat.treasure2.key.key_unable_unlock": "Your key failed to unlock the lock!",
+ "entity.treasure2.bound_soul": "Bound Soul",
+ "entity.treasure2.cauldron_chest_mimic": "Cauldron Chest Mimic",
+ "entity.treasure2.pirate_chest_mimic": "Pirate Chest Mimic",
+ "entity.treasure2.viking_chest_mimic": "Viking Chest Mimic",
+ "entity.treasure2.wood_chest_mimic": "Wood Chest Mimic",
"item.treasure2.axe_of_durin": "Axe of Durin",
"item.treasure2.black_pearl": "Black Pearl",
"item.treasure2.black_sword": "The Black Sword",
diff --git a/src/generated/resources/assets/treasure2/models/item/adornments_tab.json b/src/generated/resources/assets/treasure2/models/item/adornments_tab.json
deleted file mode 100644
index 224c3f826..000000000
--- a/src/generated/resources/assets/treasure2/models/item/adornments_tab.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "parent": "minecraft:item/generated",
- "textures": {
- "layer0": "treasure2:item/adornment/ruby_gold_ring"
- }
-}
\ No newline at end of file
diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java
index 512df531f..981092c06 100644
--- a/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java
+++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/ItemModelsProvider.java
@@ -41,8 +41,8 @@ protected void registerModels() {
singleTexture(TreasureItems.TREASURE_TAB.get().getRegistryName().getPath(),
mcLoc("item/generated"), "layer0", modLoc("item/treasure_tab"));
- singleTexture(TreasureItems.ADORNMENTS_TAB.get().getRegistryName().getPath(),
- mcLoc("item/generated"), "layer0", modLoc("item/adornment/ruby_gold_ring"));
+// singleTexture(TreasureItems.ADORNMENTS_TAB.get().getRegistryName().getPath(),
+// mcLoc("item/generated"), "layer0", modLoc("item/adornment/ruby_gold_ring"));
// keys
singleTexture(TreasureItems.WOOD_KEY.get().getRegistryName().getPath(),
diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java
index 871705fed..a415ae2f1 100644
--- a/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java
+++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/LanguageGen.java
@@ -19,6 +19,7 @@
import mod.gottsch.forge.treasure2.Treasure;
import mod.gottsch.forge.treasure2.core.block.TreasureBlocks;
+import mod.gottsch.forge.treasure2.core.entity.TreasureEntities;
import mod.gottsch.forge.treasure2.core.item.TreasureItems;
import mod.gottsch.forge.treasure2.core.util.LangUtil;
import net.minecraft.data.DataGenerator;
@@ -217,6 +218,13 @@ protected void addTranslations() {
// add(TreasureItems.WITHER_STICK_ITEM.get(), "Wither Branch");
// add(TreasureItems.WITHER_ROOT_ITEM.get(), "Wither Root");
+ // mobs
+ add(TreasureEntities.BOUND_SOUL_ENTITY_TYPE.get(), "Bound Soul");
+ add(TreasureEntities.WOOD_CHEST_MIMIC_ENTITY_TYPE.get(), "Wood Chest Mimic");
+ add(TreasureEntities.PIRATE_CHEST_MIMIC_ENTITY_TYPE.get(), "Pirate Chest Mimic");
+ add(TreasureEntities.VIKING_CHEST_MIMIC_ENTITY_TYPE.get(), "Viking Chest Mimic");
+ add(TreasureEntities.CAULDRON_CHEST_MIMIC_ENTITY_TYPE.get(), "Cauldron Chest Mimic");
+
// eggs
add(TreasureItems.BOUND_SOUL_EGG.get(), "Bound Soul Spawn Egg");
add(TreasureItems.WOOD_CHEST_MIMIC_EGG.get(), "Wood Chest Mimic Spawn Egg");
diff --git a/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java b/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java
index 05b1564e2..423a7c1ec 100644
--- a/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java
+++ b/src/main/java/mod/gottsch/forge/treasure2/datagen/Recipes.java
@@ -19,6 +19,7 @@
import java.util.function.Consumer;
+import mod.gottsch.forge.treasure2.core.block.TreasureBlocks;
import mod.gottsch.forge.treasure2.core.item.TreasureItems;
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
import net.minecraft.advancements.critereon.ItemPredicate;
@@ -29,6 +30,7 @@
import net.minecraft.data.recipes.SimpleCookingRecipeBuilder;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.level.block.Blocks;
/**
*
@@ -195,5 +197,33 @@ protected void buildCraftingRecipes(Consumer recipe) {
Items.IRON_INGOT, 1.0f, 200)
.unlockedBy("has_weapon", inventoryTrigger(ItemPredicate.Builder.item().of(TreasureItems.IRON_DWARVEN_AXE.get()).build()))
.save(recipe, "iron_ingot_from_dwarven_axe");
+
+ // gravestones
+ ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE1_POLISHED_GRANITE.get())
+ .pattern(" t")
+ .pattern(" ")
+ .pattern(" x ")
+ .define('x', Blocks.POLISHED_GRANITE)
+ .define('t', TreasureItems.TREASURE_TOOL.get())
+ .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get()))
+ .save(recipe);
+
+ ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE2_POLISHED_GRANITE.get())
+ .pattern(" t")
+ .pattern(" x ")
+ .pattern(" x ")
+ .define('x', Blocks.POLISHED_GRANITE)
+ .define('t', TreasureItems.TREASURE_TOOL.get())
+ .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get()))
+ .save(recipe);
+
+ ShapedRecipeBuilder.shaped(TreasureBlocks.GRAVESTONE3_POLISHED_GRANITE.get())
+ .pattern(" xt")
+ .pattern(" x ")
+ .pattern(" x ")
+ .define('x', Blocks.POLISHED_GRANITE)
+ .define('t', TreasureItems.TREASURE_TOOL.get())
+ .unlockedBy("has_tool", InventoryChangeTrigger.TriggerInstance.hasItems(TreasureItems.TREASURE_TOOL.get()))
+ .save(recipe);
}
}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index eebddae90..4a5b042ba 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -17,7 +17,7 @@ issueTrackerURL="https://github.com/gottsch/gottsch-minecraft-Treasure/issues" #
modId="treasure2" #mandatory
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="3.1.0" #mandatory
+version="3.1.1" #mandatory
# A display name for the mod
displayName="Treasure2" #mandatory
diff --git a/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json
deleted file mode 100644
index 549aab573..000000000
--- a/src/main/resources/data/treasure2/recipes/gravestone1_polished_granite.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "type": "minecraft:crafting_shaped",
- "group": "Treasure2",
- "pattern": [
- " T",
- " ",
- " S "
- ],
- "key": {
- "T": {
- "item": "treasure2:treasure_tool"
- },
- "S": {
- "item": "minecraft:stone",
- "data":2
- }
- },
- "result": {
- "item": "treasure2:gravestone1_polished_granite",
- "count": 1
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json
deleted file mode 100644
index 791510248..000000000
--- a/src/main/resources/data/treasure2/recipes/gravestone2_polished_granite.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "type": "minecraft:crafting_shaped",
- "group": "Treasure2",
- "pattern": [
- " T",
- " S ",
- " S "
- ],
- "key": {
- "T": {
- "item": "treasure2:treasure_tool"
- },
- "S": {
- "item": "minecraft:stone",
- "data":2
- }
- },
- "result": {
- "item": "treasure2:gravestone2_polished_granite",
- "count": 1
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json b/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json
deleted file mode 100644
index ec3b98075..000000000
--- a/src/main/resources/data/treasure2/recipes/gravestone3_polished_granite.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "type": "minecraft:crafting_shaped",
- "group": "Treasure2",
- "pattern": [
- " ST",
- " S ",
- " S "
- ],
- "key": {
- "T": {
- "item": "treasure2:treasure_tool"
- },
- "S": {
- "item": "minecraft:stone",
- "data":2
- }
- },
- "result": {
- "item": "treasure2:gravestone3_polished_granite",
- "count": 1
- }
-}
\ No newline at end of file
diff --git a/update.json b/update.json
index 0a31d5de0..0f2a31253 100644
--- a/update.json
+++ b/update.json
@@ -1,11 +1,12 @@
{
"homepage": "https://minecraft.curseforge.com/projects/treasure2",
"promos": {
- "1.18.2-latest": "3.1.0",
- "1.18.2-recommended": "3.1.0"
+ "1.18.2-latest": "3.1.1",
+ "1.18.2-recommended": "3.1.1"
},
"1.18.2": {
"3.0.0": "Initial port from 1.16.5. See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md",
- "3.1.0": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md"
+ "3.1.0": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md",
+ "3.1.1": "See https://raw.githubusercontent.com/gottsch/gottsch-minecraft-Treasure/1.18.2-master/CHANGELOG.md"
}
}
\ No newline at end of file