Update 4.2.1.50-experimental

.gitattributes

@@ -0,0 +1,5 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: "com.wynprice.cursemaven"
 
-version = '2.0'
+version = '4.2.1.50-experimental'
 group = 'fr.alasdiablo.janoeo.arsenal'
 archivesBaseName = 'Janoeo-Arsenal'
 
@@ -62,7 +62,7 @@ minecraft {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.15.2-31.2.0'
-    compile fg.deobf('curse.maven:jenoeo:2964713')
+    compile fg.deobf('curse.maven:jenoeo:3059863')
 }
 
 jar {

changelog.md

@@ -1,3 +1,18 @@
+### 4.2.1.50-experimental
++ back port to 1.15
+
+### 4.2.1.44-experimental
++ add tin tools
+
+### 4.2.0.43-experimental
++ add compatibility with Janoeo 4.4.0.42-experimental
++ internal code rework
+
+### 2.0.1
++ port to Minecraft 1.16.1
++ known problem
+    + Armor and tools can't be repaired via other mod
+
 ### 2.0
 + optimized entity falling event (damage reduction with wool boots)
 + add new tools

src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "janoeo_arsenal:tin_axe"
+    ]
+  },
+  "criteria": {
+    "has_tin": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/tin"
+          }
+        ]
+      }
+    },
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:rods/wooden"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "janoeo_arsenal:tin_axe"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tin",
+      "has_stick",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "janoeo_arsenal:tin_hoe"
+    ]
+  },
+  "criteria": {
+    "has_tin": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/tin"
+          }
+        ]
+      }
+    },
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:rods/wooden"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "janoeo_arsenal:tin_hoe"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tin",
+      "has_stick",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "janoeo_arsenal:tin_pickaxe"
+    ]
+  },
+  "criteria": {
+    "has_tin": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/tin"
+          }
+        ]
+      }
+    },
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:rods/wooden"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "janoeo_arsenal:tin_pickaxe"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tin",
+      "has_stick",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "janoeo_arsenal:tin_shovel"
+    ]
+  },
+  "criteria": {
+    "has_tin": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/tin"
+          }
+        ]
+      }
+    },
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:rods/wooden"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "janoeo_arsenal:tin_shovel"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tin",
+      "has_stick",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "janoeo_arsenal:tin_sword"
+    ]
+  },
+  "criteria": {
+    "has_tin": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:ingots/tin"
+          }
+        ]
+      }
+    },
+    "has_stick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "tag": "forge:rods/wooden"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "janoeo_arsenal:tin_sword"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_tin",
+      "has_stick",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/janoeo_arsenal/recipes/tin_axe.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AA",
+    "AS",
+    " S"
+  ],
+  "key": {
+    "A": {
+      "tag": "forge:ingots/tin"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "janoeo_arsenal:tin_axe"
+  }
+}

src/generated/resources/data/janoeo_arsenal/recipes/tin_hoe.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AA",
+    " S",
+    " S"
+  ],
+  "key": {
+    "A": {
+      "tag": "forge:ingots/tin"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "janoeo_arsenal:tin_hoe"
+  }
+}

src/generated/resources/data/janoeo_arsenal/recipes/tin_pickaxe.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "AAA",
+    " S ",
+    " S "
+  ],
+  "key": {
+    "A": {
+      "tag": "forge:ingots/tin"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "janoeo_arsenal:tin_pickaxe"
+  }
+}

src/generated/resources/data/janoeo_arsenal/recipes/tin_shovel.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "A",
+    "S",
+    "S"
+  ],
+  "key": {
+    "A": {
+      "tag": "forge:ingots/tin"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "janoeo_arsenal:tin_shovel"
+  }
+}

src/generated/resources/data/janoeo_arsenal/recipes/tin_sword.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "C",
+    "C",
+    "S"
+  ],
+  "key": {
+    "C": {
+      "tag": "forge:ingots/tin"
+    },
+    "S": {
+      "tag": "forge:rods/wooden"
+    }
+  },
+  "result": {
+    "item": "janoeo_arsenal:tin_sword"
+  }
+}

src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java

@@ -1,7 +1,7 @@
 package fr.alasdiablo.janoeo.arsenal;
 
-import fr.alasdiablo.janoeo.arsenal.utils.Registries;
-import fr.alasdiablo.janoeo.arsenal.utils.ModSetup;
+import fr.alasdiablo.janoeo.arsenal.util.Registries;
+import fr.alasdiablo.janoeo.arsenal.util.ModSetup;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;