compatibility path for janoeo 4.4.x.x

Janoeo · Jul 18, 2020 · 526a1e6 · 526a1e6
1 parent ea2af12
commit 526a1e6
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 49 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: "com.wynprice.cursemaven"
 
-version = '2.0.1'
+version = '4.2.0.43-experimental'
 group = 'fr.alasdiablo.janoeo.arsenal'
 archivesBaseName = 'Janoeo-Arsenal'
 
@@ -60,7 +60,7 @@ minecraft {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.16.1-32.0.66'
-    compile fg.deobf('curse.maven:jenoeo:3002893')
+    compile fg.deobf('curse.maven:jenoeo:3008143')
 }
 
 jar {

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+### 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

diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/Arsenal.java b/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;

diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/data/Recipes.java
@@ -1,16 +1,15 @@
 package fr.alasdiablo.janoeo.arsenal.data;
 
-import fr.alasdiablo.janoeo.arsenal.init.Armors;
-import fr.alasdiablo.janoeo.arsenal.init.Tools;
-import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors;
+import fr.alasdiablo.janoeo.arsenal.item.Armors;
+import fr.alasdiablo.janoeo.arsenal.item.Tools;
+import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors;
 import fr.alasdiablo.janoeo.tags.ItemsTags;
 import javafx.util.Pair;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.data.*;
 import net.minecraft.item.Item;
 import net.minecraft.tags.ITag;
-import net.minecraft.tags.Tag;
 import net.minecraftforge.common.Tags;
 
 import java.util.Arrays;

diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/event/WoolArmorEvent.java
@@ -1,10 +1,9 @@
 package fr.alasdiablo.janoeo.arsenal.event;
 
-import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors;
+import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.inventory.EquipmentSlotType;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingFallEvent;

diff --git a/...lasdiablo/janoeo/arsenal/init/Armors.java → ...lasdiablo/janoeo/arsenal/item/Armors.java b/...lasdiablo/janoeo/arsenal/init/Armors.java → ...lasdiablo/janoeo/arsenal/item/Armors.java
@@ -1,8 +1,8 @@
-package fr.alasdiablo.janoeo.arsenal.init;
+package fr.alasdiablo.janoeo.arsenal.item;
 
 import fr.alasdiablo.janoeo.arsenal.Arsenal;
-import fr.alasdiablo.janoeo.arsenal.utils.ArmorsMaterials;
-import fr.alasdiablo.janoeo.arsenal.utils.Registries;
+import fr.alasdiablo.janoeo.arsenal.util.ArmorsMaterials;
+import fr.alasdiablo.janoeo.arsenal.util.Registries;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;

diff --git a/src/main/java/fr/alasdiablo/janoeo/arsenal/item/CustomHoeItem.java b/src/main/java/fr/alasdiablo/janoeo/arsenal/item/CustomHoeItem.java
diff --git a/...alasdiablo/janoeo/arsenal/init/Tools.java → ...alasdiablo/janoeo/arsenal/item/Tools.java b/...alasdiablo/janoeo/arsenal/init/Tools.java → ...alasdiablo/janoeo/arsenal/item/Tools.java
@@ -1,9 +1,8 @@
-package fr.alasdiablo.janoeo.arsenal.init;
+package fr.alasdiablo.janoeo.arsenal.item;
 
 import fr.alasdiablo.janoeo.arsenal.Arsenal;
-import fr.alasdiablo.janoeo.arsenal.item.CustomHoeItem;
-import fr.alasdiablo.janoeo.arsenal.utils.ItemsTiers;
-import fr.alasdiablo.janoeo.arsenal.utils.Registries;
+import fr.alasdiablo.janoeo.arsenal.util.ItemsTiers;
+import fr.alasdiablo.janoeo.arsenal.util.Registries;
 import net.minecraft.item.*;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -43,13 +42,13 @@ public static void onItemsRegistry(final RegistryEvent.Register<Item> event) {
             IForgeRegistry<Item> e = event.getRegistry();
 
             e.register(new AxeItem(ItemsTiers.COPPER, 6.5f, -3.15f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_AXE));
-            e.register(new CustomHoeItem(ItemsTiers.COPPER, -1, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_HOE));
+            e.register(new HoeItem(ItemsTiers.COPPER, -1, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_HOE));
             e.register(new PickaxeItem(ItemsTiers.COPPER, 1, -2.8f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_PICKAXE));
             e.register(new ShovelItem(ItemsTiers.COPPER, 1.5f, -3.0f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_SHOVEL));
             e.register(new SwordItem(ItemsTiers.COPPER, 3, -2.4f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.COPPER_SWORD));
 
             e.register(new AxeItem(ItemsTiers.ALUMINIUM, 6.5f, -3.15f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_AXE));
-            e.register(new CustomHoeItem(ItemsTiers.ALUMINIUM, -1, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_HOE));
+            e.register(new HoeItem(ItemsTiers.ALUMINIUM, -1, -1.5f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_HOE));
             e.register(new PickaxeItem(ItemsTiers.ALUMINIUM, 1, -2.8f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_PICKAXE));
             e.register(new ShovelItem(ItemsTiers.ALUMINIUM, 1.5f, -3.0f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_SHOVEL));
             e.register(new SwordItem(ItemsTiers.ALUMINIUM, 3, -2.4f, new Item.Properties().group(Arsenal.setup.janoeoToolGroup)).setRegistryName(Registries.ALUMINIUM_SWORD));

diff --git a/...ablo/janoeo/arsenal/init/WoolsArmors.java → ...ablo/janoeo/arsenal/item/WoolsArmors.java b/...ablo/janoeo/arsenal/init/WoolsArmors.java → ...ablo/janoeo/arsenal/item/WoolsArmors.java
@@ -1,8 +1,8 @@
-package fr.alasdiablo.janoeo.arsenal.init;
+package fr.alasdiablo.janoeo.arsenal.item;
 
 import fr.alasdiablo.janoeo.arsenal.Arsenal;
-import fr.alasdiablo.janoeo.arsenal.utils.ArmorsMaterials;
-import fr.alasdiablo.janoeo.arsenal.utils.Registries;
+import fr.alasdiablo.janoeo.arsenal.util.ArmorsMaterials;
+import fr.alasdiablo.janoeo.arsenal.util.Registries;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;

diff --git a/...janoeo/arsenal/utils/ArmorsMaterials.java → .../janoeo/arsenal/util/ArmorsMaterials.java b/...janoeo/arsenal/utils/ArmorsMaterials.java → .../janoeo/arsenal/util/ArmorsMaterials.java
@@ -1,7 +1,6 @@
-package fr.alasdiablo.janoeo.arsenal.utils;
+package fr.alasdiablo.janoeo.arsenal.util;
 
-import fr.alasdiablo.janoeo.ingots.IngotsItems;
-import fr.alasdiablo.janoeo.tags.ItemsTags;
+import fr.alasdiablo.janoeo.item.IngotsItems;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.IArmorMaterial;
 import net.minecraft.item.ItemStack;

diff --git a/.../janoeo/arsenal/utils/DataGenerators.java → ...o/janoeo/arsenal/util/DataGenerators.java b/.../janoeo/arsenal/utils/DataGenerators.java → ...o/janoeo/arsenal/util/DataGenerators.java
@@ -1,4 +1,4 @@
-package fr.alasdiablo.janoeo.arsenal.utils;
+package fr.alasdiablo.janoeo.arsenal.util;
 
 import fr.alasdiablo.janoeo.arsenal.data.Recipes;
 import net.minecraft.data.DataGenerator;

diff --git a/...ablo/janoeo/arsenal/utils/ItemsTiers.java → ...iablo/janoeo/arsenal/util/ItemsTiers.java b/...ablo/janoeo/arsenal/utils/ItemsTiers.java → ...iablo/janoeo/arsenal/util/ItemsTiers.java
@@ -1,16 +1,12 @@
-package fr.alasdiablo.janoeo.arsenal.utils;
+package fr.alasdiablo.janoeo.arsenal.util;
 
-import fr.alasdiablo.janoeo.ingots.IngotsItems;
-import fr.alasdiablo.janoeo.tags.ItemsTags;
+import fr.alasdiablo.janoeo.item.IngotsItems;
 import net.minecraft.item.IItemTier;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.tags.ItemTags;
-import net.minecraftforge.common.Tags;
 
 public enum ItemsTiers implements IItemTier {
-    //COPPER(2, 32, 6.0f, 1.5f, 9, Ingredient.fromStacks(new ItemStack(IngotsItems.COPPER_INGOT))),
-    COPPER(2, 32, 6.0f, 1.5f, 9, Ingredient.fromTag(Tags.Items.FENCES_WOODEN)),
+    COPPER(2, 32, 6.0f, 1.5f, 9, Ingredient.fromStacks(new ItemStack(IngotsItems.COPPER_INGOT))),
     ALUMINIUM(2, 28, 5.0f, 1.0f, 6, Ingredient.fromStacks(new ItemStack(IngotsItems.ALUMINIUM_INGOT)));
 
     private final int harvestLevel;

diff --git a/...diablo/janoeo/arsenal/utils/ModSetup.java → ...sdiablo/janoeo/arsenal/util/ModSetup.java b/...diablo/janoeo/arsenal/utils/ModSetup.java → ...sdiablo/janoeo/arsenal/util/ModSetup.java
@@ -1,9 +1,9 @@
-package fr.alasdiablo.janoeo.arsenal.utils;
+package fr.alasdiablo.janoeo.arsenal.util;
 
 import fr.alasdiablo.janoeo.arsenal.event.IInitEvent;
 import fr.alasdiablo.janoeo.arsenal.event.WoolArmorEvent;
-import fr.alasdiablo.janoeo.arsenal.init.Tools;
-import fr.alasdiablo.janoeo.arsenal.init.WoolsArmors;
+import fr.alasdiablo.janoeo.arsenal.item.Tools;
+import fr.alasdiablo.janoeo.arsenal.item.WoolsArmors;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 

diff --git a/...ablo/janoeo/arsenal/utils/Registries.java → ...iablo/janoeo/arsenal/util/Registries.java b/...ablo/janoeo/arsenal/utils/Registries.java → ...iablo/janoeo/arsenal/util/Registries.java
@@ -1,7 +1,6 @@
-package fr.alasdiablo.janoeo.arsenal.utils;
+package fr.alasdiablo.janoeo.arsenal.util;
 
 import net.minecraft.block.Blocks;
-import net.minecraft.item.ArmorMaterial;
 import net.minecraft.item.Item;
 
 /**

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -23,6 +23,6 @@ Just Another Nether/Overworld/End Ores - Arsenal by AlasDiablo, lIotaMiu, Egame2
 [[dependencies.janoeo_arsenal]]
     modId="janoeo"
     mandatory=true
-    versionRange="[3.6,)"
+    versionRange="[4.4,)"
     ordering="AFTER"
     side="BOTH"