Merge branch '7.3' into fork/gungun974/network

# Conflicts:
#	src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java

Author: MartinSVK12

build.gradle

@@ -26,6 +26,7 @@ version = project.mod_version
 loom {
 	noIntermediateMappings()
 	customMinecraftMetadata.set("https://downloads.betterthanadventure.net/bta-client/${project.bta_channel}/v${project.bta_version}/manifest.json")
+	accessWidenerPath = file("src/main/resources/halplibe.accesswidener")
 }
 
 repositories {

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.3
+bta_version=7.3_01
 bta_channel=release
 
 # Loader
@@ -11,6 +11,6 @@ loader_version=0.15.6-bta.7
 mod_menu_version=3.0.0
 
 # Mod
-mod_version=5.1.2
+mod_version=5.1.5
 mod_group=turniplabs
 mod_name=halplibe

src/main/java/turniplabs/halplibe/helper/ArmorHelper.java

@@ -17,7 +17,7 @@ public final class ArmorHelper {
      */
     @SuppressWarnings("unused") // API function
     public static ArmorMaterial createArmorMaterial(String modId, String name, int durability, float combat, float blast, float fire, float fall) {
-        ArmorMaterial armorMaterial = new ArmorMaterial(new NamespaceID(modId, name), durability)
+        ArmorMaterial armorMaterial = new ArmorMaterial(NamespaceID.getPermanent(modId, name), durability)
                 .withProtectionPercentage(DamageType.COMBAT, combat)
                 .withProtectionPercentage(DamageType.BLAST, blast)
                 .withProtectionPercentage(DamageType.FIRE, fire)

src/main/java/turniplabs/halplibe/helper/CreativeHelper.java

@@ -48,7 +48,7 @@ public static void setParent(IItemConvertible itemToAdd, IItemConvertible itemPa
      */
     @SuppressWarnings("unused")
     public static void setParent(IItemConvertible itemToAdd, int metaToAdd, IItemConvertible itemParent, int metaParent){
-        setParent(new ItemStack(itemToAdd, 1, metaToAdd), new ItemStack(itemParent, metaParent));
+        setParent(new ItemStack(itemToAdd, 1, metaToAdd), new ItemStack(itemParent, 1, metaParent));
     }
     /**
      * @param itemToAdd The itemstack to be added to the creative inventory list

src/main/java/turniplabs/halplibe/helper/ItemBuilder.java

@@ -138,11 +138,7 @@ public <T extends Item> T build(T item){
         }
 
         if (maxDamage != null){
-            try {
-                item.getClass().getMethod("setMaxDamage", int.class).invoke(item, maxDamage);
-            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                throw new RuntimeException(e);
-            }
+            item.setMaxDamage(maxDamage);
         }
 
         List<String> newTokens = new ArrayList<>();

src/main/java/turniplabs/halplibe/helper/NetworkHelper.java

@@ -76,7 +76,7 @@ public int compareTo(@NotNull NetworkEntry o) {
 
             f.setAccessible(false);
 
-            addMapping = Packet.class.getDeclaredMethod("addIdClassMapping", int.class, boolean.class, boolean.class, Class.class);
+            addMapping = Packet.class.getDeclaredMethod("addMapping", int.class, boolean.class, boolean.class, Class.class);
         } catch (Throwable err) {
             throw new RuntimeException(err);
         }

src/main/java/turniplabs/halplibe/mixin/MinecraftMixin.java

@@ -8,8 +8,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import turniplabs.halplibe.helper.network.NetworkHandler;
+
+import turniplabs.halplibe.util.BlockInitEntrypoint;
 import turniplabs.halplibe.util.ClientStartEntrypoint;
 import turniplabs.halplibe.util.GameStartEntrypoint;
+import turniplabs.halplibe.util.ItemInitEntrypoint;
 import turniplabs.halplibe.util.RecipeEntrypoint;
 
 @Mixin(
@@ -38,6 +41,16 @@ public void afterGameStartEntrypoint(CallbackInfo ci){
         FabricLoader.getInstance().getEntrypoints("afterClientStart", ClientStartEntrypoint.class).forEach(ClientStartEntrypoint::afterClientStart);
     }
 
+    @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/block/Blocks;init()V", shift = At.Shift.AFTER))
+    public void afterBlockInitEntrypoint(CallbackInfo callbackInfo) {
+        FabricLoader.getInstance().getEntrypoints("afterBlockInit", BlockInitEntrypoint.class).forEach(BlockInitEntrypoint::afterBlockInit);;
+    }
+
+    @Inject(method = "startGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/item/Items;init()V", shift = At.Shift.AFTER))
+    public void afterItemInitEntrypoint(CallbackInfo callbackInfo) {
+        FabricLoader.getInstance().getEntrypoints("afterItemInit", ItemInitEntrypoint.class).forEach(ItemInitEntrypoint::afterItemInit);;
+    }
+
     @Inject(method = "printWrongJavaVersionInfo", at = @At("HEAD"), cancellable = true)
     private void printWrongJavaVersionInfo(CallbackInfo ci) {
         if (Minecraft.getOs() == EnumOS.linux){

src/main/java/turniplabs/halplibe/util/BlockInitEntrypoint.java

@@ -0,0 +1,5 @@
+package turniplabs.halplibe.util;
+
+public interface BlockInitEntrypoint {
+    void afterBlockInit();
+}

src/main/java/turniplabs/halplibe/util/ItemInitEntrypoint.java

@@ -0,0 +1,5 @@
+package turniplabs.halplibe.util;
+
+public interface ItemInitEntrypoint {
+    void afterItemInit();
+}

src/main/resources/fabric.mod.json

@@ -28,6 +28,7 @@
   "mixins": [
       "halplibe.mixins.json"
   ],
+  "accessWidener": "halplibe.accesswidener",
 
   "depends": {
   },

src/main/resources/halplibe.accesswidener

@@ -0,0 +1,3 @@
+accessWidener v2 named
+
+transitive-accessible method net/minecraft/core/item/Item setMaxDamage (I)Lnet/minecraft/core/item/Item;