⬆️ 1.19.4 port

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod
-version=1.19.2-0.5.0
+version=1.19.4-0.5.1
 mod_group=org.mineplugin.locusazzurro.icaruswings
 mod_id=locusazzurro_icaruswings
 mod_name=Icarus Wings
@@ -13,11 +13,11 @@ mod_credits=Contributors on GitHub and all who supported development.
 mod_icon=icarus_wings.png
 
 # Dependencies
-minecraft_version=1.19.2
-minecraft_version_range=[1.19.2]
-forge_version=43.2.0
-forge_version_range=[43,)
-loader_version_range=[43,)
+minecraft_version=1.19.4
+minecraft_version_range=[1.19.4]
+forge_version=45.1.0
+forge_version_range=[45,)
+loader_version_range=[45,)
 mappings_channel=official
-mappings_version=1.19.2
+mappings_version=1.19.4
 mixin_version=0.8.4

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -0,0 +1,3 @@
+// 1.19.4	2023-07-15T14:23:06.4598326	Registries
+763791e06f5c4ed4d0050991e7e3c0c6ea8b233b data/locusazzurro_icaruswings/damage_type/spear.json
+91d8a4c4673f585a6c9e320542ca3d96c355297f data/locusazzurro_icaruswings/damage_type/time_rift.json

src/generated/resources/.cache/3ad3c4526bc19707067928568367be95fefa33f1

@@ -0,0 +1 @@
+// 1.19.4	2023-07-15T14:23:06.453831	Item Models: locusazzurro_icaruswings

src/generated/resources/.cache/636274dd245a3d898f68344c2253b73cd985170e

@@ -0,0 +1 @@
+// 1.19.4	2023-07-15T14:23:06.4558333	Block States: locusazzurro_icaruswings

src/generated/resources/.cache/75b6aaf6155f06a86b4bbdd88db80e772c960ed5

@@ -0,0 +1,7 @@
+// 1.19.4	2023-07-15T14:23:06.4608334	Icarus WingsBlock Tags
+979e25ed888a5b20cda2e2dc21e351998f39b80e data/minecraft/tags/blocks/mineable/pickaxe.json
+ff9f99cbd343a66dce509bf27bebcc63722eb35d data/minecraft/tags/blocks/mineable/shovel.json
+56bb632cd5fdd7cbeda8e09be29e0b908a983f9a data/minecraft/tags/blocks/needs_iron_tool.json
+967c11dbf3deb9d153a4175268222efc8b5f94fe data/minecraft/tags/blocks/needs_stone_tool.json
+f8a20788de08f2ee43580cbaae130bc1047d6734 data/minecraft/tags/blocks/wool.json
+0dbfd1ccd4c1029ebbd512b4eca46286318dcc5f data/minecraft/tags/blocks/wool_carpets.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -0,0 +1 @@
+// 1.19.4	2023-07-15T14:23:06.4558333	Recipes

src/generated/resources/.cache/fe29277b4ba34f8d18bfab3b93fec645bdce4cdb

@@ -0,0 +1,10 @@
+// 1.19.4	2023-07-15T14:23:06.454832	Icarus WingsItem Tags
+b7e91efe4995c4b86573a2bd926e4182eee7cdec data/locusazzurro_icaruswings/tags/items/colored_feathers.json
+d66b65c515fdb20ffc9c22a41ecd1bc17b61d0f6 data/locusazzurro_icaruswings/tags/items/crop_grains.json
+1f8ac3247f3d11f23b38d6da6f4916a06e72aa05 data/locusazzurro_icaruswings/tags/items/crop_strings.json
+3a890ef8d740b0103c0e54a67c55349a6e1f966b data/locusazzurro_icaruswings/tags/items/fallen_relics.json
+31b4f1eaa4dd3828a846f05b4b2ec79cf961cb3d data/locusazzurro_icaruswings/tags/items/herbs.json
+7e5a857845e9eedfba30a8556abe866ecce677d6 data/locusazzurro_icaruswings/tags/items/restored_fallen_relics.json
+32f3b055773092e08427b0ce90302c627390d345 data/locusazzurro_icaruswings/tags/items/synapse_armor.json
+e588fd94a320df5a6b4e19ca18827ce2374f7656 data/locusazzurro_icaruswings/tags/items/world_essences.json
+a83382822f5079fc344889eeba2d88894566d277 data/locusazzurro_icaruswings/tags/items/world_ingots.json

src/generated/resources/data/locusazzurro_icaruswings/damage_type/spear.json

@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "spear",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/locusazzurro_icaruswings/damage_type/time_rift.json

@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "time_rift",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/locusazzurro_icaruswings/tags/items/colored_feathers.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:red_feather",
     "locusazzurro_icaruswings:blue_feather",

src/generated/resources/data/locusazzurro_icaruswings/tags/items/crop_grains.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:wheat_grains",
     "locusazzurro_icaruswings:flax_seeds"

src/generated/resources/data/locusazzurro_icaruswings/tags/items/crop_strings.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:wheat_string",
     "locusazzurro_icaruswings:linen_string"

src/generated/resources/data/locusazzurro_icaruswings/tags/items/fallen_relics.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:fallen_relic_core",
     "locusazzurro_icaruswings:fallen_relic_offensive",

src/generated/resources/data/locusazzurro_icaruswings/tags/items/herbs.json

@@ -1,14 +1,10 @@
 {
-  "replace": false,
   "values": [
     "#minecraft:small_flowers",
     "#minecraft:tall_flowers",
     "#minecraft:saplings",
     "minecraft:fern",
     "minecraft:sea_pickle",
     "minecraft:sweet_berries"
-  ],
-  "remove": [
-    "minecraft:wither_rose"
   ]
 }

src/generated/resources/data/locusazzurro_icaruswings/tags/items/restored_fallen_relics.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:restored_fallen_relic_core",
     "locusazzurro_icaruswings:restored_fallen_relic_offensive",

src/generated/resources/data/locusazzurro_icaruswings/tags/items/synapse_armor.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:synapse_helmet",
     "locusazzurro_icaruswings:synapse_chestplate",

src/generated/resources/data/locusazzurro_icaruswings/tags/items/world_essences.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:zephir_essence",
     "locusazzurro_icaruswings:nether_essence",

src/generated/resources/data/locusazzurro_icaruswings/tags/items/world_ingots.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:steel_ingot",
     "locusazzurro_icaruswings:magma_ingot",

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:refined_beeswax_block",
     "locusazzurro_icaruswings:refined_beeswax_pillar",

src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:elysian_soil",
     "locusazzurro_icaruswings:elysian_grass_block"

src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:mead_pot"
   ]

src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:refined_beeswax_block",
     "locusazzurro_icaruswings:refined_beeswax_pillar",

src/generated/resources/data/minecraft/tags/blocks/wool.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:golden_wool_block"
   ]

src/generated/resources/data/minecraft/tags/blocks/carpets.json → src/generated/resources/data/minecraft/tags/blocks/wool_carpets.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "locusazzurro_icaruswings:golden_wool_carpet"
   ]

src/main/java/org/mineplugin/locusazzurro/icaruswings/blocks/ElysianGrass.java

@@ -4,6 +4,7 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.TallGrassBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -27,7 +28,7 @@ protected boolean mayPlaceOn(BlockState stateIn, BlockGetter iBlockReader, Block
     }
 
     @Override
-    public boolean isValidBonemealTarget(BlockGetter p_176473_1_, BlockPos p_176473_2_, BlockState p_176473_3_, boolean p_176473_4_) {
+    public boolean isValidBonemealTarget(LevelReader p_255692_, BlockPos p_57326_, BlockState p_57327_, boolean p_57328_) {
         return false;
     }
 

src/main/java/org/mineplugin/locusazzurro/icaruswings/blocks/GreekFireBlock.java

@@ -22,16 +22,16 @@ public GreekFireBlock(){
 
     @SuppressWarnings("deprecation")
     @Override
-    public void entityInside(BlockState p_49260_, Level p_49261_, BlockPos p_49262_, Entity p_49263_) {
-        if (!p_49263_.fireImmune()) {
-            p_49263_.setRemainingFireTicks(p_49263_.getRemainingFireTicks() + 1);
-            if (p_49263_.getRemainingFireTicks() == 0) {
-                p_49263_.setSecondsOnFire(8);
+    public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) {
+        if (!entity.fireImmune()) {
+            entity.setRemainingFireTicks(entity.getRemainingFireTicks() + 1);
+            if (entity.getRemainingFireTicks() == 0) {
+                entity.setSecondsOnFire(8);
             }
         }
 
-        p_49263_.hurt(DamageSource.IN_FIRE, 4);
-        super.entityInside(p_49260_, p_49261_, p_49262_, p_49263_);
+        entity.hurt(level.damageSources().inFire(), 4);
+        super.entityInside(state, level, pos, entity);
     }
 
     @Override

src/main/java/org/mineplugin/locusazzurro/icaruswings/blocks/GreekFireFluidType.java

@@ -2,7 +2,7 @@
 
 import com.mojang.blaze3d.shaders.FogShape;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.math.Vector3f;
+import org.joml.Vector3f;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/org/mineplugin/locusazzurro/icaruswings/data/ModArmorMaterial.java

@@ -4,6 +4,7 @@
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraftforge.api.distmarker.Dist;
@@ -71,15 +72,19 @@ public enum ModArmorMaterial implements ArmorMaterial {
 	public String getName() {
 		return this.name;
 	}
-	
+
 	@Override
-	public int getDurabilityForSlot(EquipmentSlot slot) {
-	    return HEALTH_PER_SLOT[slot.getIndex()] * this.durabilityMultiplier;
+	public int getDurabilityForType(ArmorItem.Type slot) {
+		return HEALTH_PER_SLOT[slot.getSlot().getIndex()] * this.durabilityMultiplier;
 	}
-	
+
 	@Override
+	public int getDefenseForType(ArmorItem.Type type) {
+		return this.slotProtections[type.getSlot().getIndex()];
+	}
+
 	public int getDefenseForSlot(EquipmentSlot slot) {
-	    return this.slotProtections[slot.getIndex()];
+		return this.slotProtections[slot.getIndex()];
 	}
 
 	@Override

src/main/java/org/mineplugin/locusazzurro/icaruswings/data/ModDamageSources.java

@@ -1,13 +1,41 @@
 package org.mineplugin.locusazzurro.icaruswings.data;
 
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.worldgen.BootstapContext;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
-import org.mineplugin.locusazzurro.icaruswings.damage.DamageTimeRift;
+import net.minecraft.world.level.Level;
+import org.mineplugin.locusazzurro.icaruswings.registry.DamageTypeRegistry;
+import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.core.Holder.Reference;
 
 public class ModDamageSources {
 
-    public static DamageSource timeRift(Entity source){
-        return new DamageTimeRift(source);
+    public static void bootstrap(BootstapContext<DamageType> context)
+    {
+        context.register(DamageTypeRegistry.SPEAR, new DamageType("spear", 0.1F));
+        context.register(DamageTypeRegistry.TIME_RIFT, new DamageType("time_rift", 0.1F));
+    }
+
+    public static Reference<DamageType> damageTypeReference(Level pLevel, ResourceKey<DamageType> type){
+        return pLevel.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(type);
+    }
+
+    public static DamageSource spear(Level level, Entity projectile, Entity owner){
+        return new DamageSource(damageTypeReference(level, DamageTypeRegistry.SPEAR), projectile, owner);
+    }
+
+    public static DamageSource timeRift(Level level, Entity projectile, Entity owner){
+        return new DamageSource(damageTypeReference(level, DamageTypeRegistry.TIME_RIFT), projectile, owner);
+    }
+
+    public static DamageSource timeRift(Level level, Entity source){
+        return new DamageSource(damageTypeReference(level, DamageTypeRegistry.TIME_RIFT), source);
+    }
+
+    public static DamageSource timeRift(Level level){
+        return new DamageSource(damageTypeReference(level, DamageTypeRegistry.TIME_RIFT));
     }
 
 }

src/main/java/org/mineplugin/locusazzurro/icaruswings/data/ModData.java

@@ -5,6 +5,7 @@
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.item.ArmorItem;
 
 import java.util.UUID;
 
@@ -17,6 +18,16 @@ public class ModData {
 			UUID.fromString("9F3D476D-C118-4544-8365-64846904B48E"),
 			UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150")};
 
+	public static ImmutableMultimap.Builder<Attribute, AttributeModifier> createArmorModifierBuilder(ArmorItem.Type type, ModArmorMaterial material){
+		ImmutableMultimap.Builder<Attribute, AttributeModifier> builder = ImmutableMultimap.builder();
+		UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[type.getSlot().getIndex()];
+		builder.put(Attributes.ARMOR, new AttributeModifier(uuid, "Armor modifier",
+				(double) material.getDefenseForType(type), AttributeModifier.Operation.ADDITION));
+		builder.put(Attributes.ARMOR_TOUGHNESS, new AttributeModifier(uuid, "Armor toughness",
+				(double) material.getToughness(), AttributeModifier.Operation.ADDITION));
+		return builder;
+	}
+
 	public static ImmutableMultimap.Builder<Attribute, AttributeModifier> createArmorModifierBuilder(EquipmentSlot slot, ModArmorMaterial material){
 		ImmutableMultimap.Builder<Attribute, AttributeModifier> builder = ImmutableMultimap.builder();
 		UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[slot.getIndex()];