Merge pull request #325 from gottsch/1.18.2-develop

1.18.2 develop

.classpath

@@ -2,46 +2,42 @@
 <classpath>
 	<classpathentry kind="src" output="bin/main" path="src/main/java">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="src/generated/resources">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/test" path="src/test/java">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
-			<attribute name="test" value="true"/>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/test" path="src/test/resources">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
-			<attribute name="test" value="true"/>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Development\workspace\git\Treasure-1.18.2\build\natives"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

CHANGELOG.md

@@ -5,9 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [3.1.1] - 2023-07-11
 
-## [3.0.0] - 2023-06-30
+### Changed
+
+- Added names for all mobs.
+- Fixed polished granite gravestone recipes.
+
+## [3.1.0] - 2023-06-25
+
+### Added
+
+- Added Crate and Moldy Crate mimics.
+
+### Changed
+
+- updated the topaz key texture to be more like the onyx key
+
+## [3.0.0] - 2023-06-24
 
 - Initial release for mc1.18.2 port.
 
@@ -32,4 +47,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- Removed all Charms and charm-related contect. They are being moved to a new stand-alone mod tentatively called 'GealdorCraft', which will have built-in itegration with Treasure2.
+- Removed all Charms and charm-related content. They are being moved to a new stand-alone mod tentatively called 'GealdorCraft', which will have built-in itegration with Treasure2.

gradle.properties

@@ -8,7 +8,7 @@ package_group=gottsch
 # use alpha, beta, or v (for version)
 mod_version_type=
 
-mod_version=3.0.0
+mod_version=3.1.1
 
 #versions
 mc_version=1.18.2

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",

src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone1_polished_granite.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "treasure2:gravestone1_polished_granite"
+    ]
+  },
+  "criteria": {
+    "has_tool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "treasure2:treasure_tool"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "treasure2:gravestone1_polished_granite"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tool",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone2_polished_granite.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "treasure2:gravestone2_polished_granite"
+    ]
+  },
+  "criteria": {
+    "has_tool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "treasure2:treasure_tool"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "treasure2:gravestone2_polished_granite"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tool",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/treasure2/advancements/recipes/treasure2/gravestone3_polished_granite.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "treasure2:gravestone3_polished_granite"
+    ]
+  },
+  "criteria": {
+    "has_tool": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "treasure2:treasure_tool"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "treasure2:gravestone3_polished_granite"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tool",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/treasure2/recipes/gravestone1_polished_granite.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "  t",
+    "   ",
+    " x "
+  ],
+  "key": {
+    "x": {
+      "item": "minecraft:polished_granite"
+    },
+    "t": {
+      "item": "treasure2:treasure_tool"
+    }
+  },
+  "result": {
+    "item": "treasure2:gravestone1_polished_granite"
+  }
+}

src/generated/resources/data/treasure2/recipes/gravestone2_polished_granite.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "  t",
+    " x ",
+    " x "
+  ],
+  "key": {
+    "x": {
+      "item": "minecraft:polished_granite"
+    },
+    "t": {
+      "item": "treasure2:treasure_tool"
+    }
+  },
+  "result": {
+    "item": "treasure2:gravestone2_polished_granite"
+  }
+}

src/generated/resources/data/treasure2/recipes/gravestone3_polished_granite.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " xt",
+    " x ",
+    " x "
+  ],
+  "key": {
+    "x": {
+      "item": "minecraft:polished_granite"
+    },
+    "t": {
+      "item": "treasure2:treasure_tool"
+    }
+  },
+  "result": {
+    "item": "treasure2:gravestone3_polished_granite"
+  }
+}

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(),

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");

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<FinishedRecipe> 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);
 		}
 }

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.0.0" #mandatory
+version="3.1.1" #mandatory
 
  # A display name for the mod
 displayName="Treasure2" #mandatory