diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9f8dcb9..7ada658 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -57,8 +57,8 @@ body: - type: input id: mod-version attributes: - label: TemplateMod version - description: The TemplateMod version(s) where this bug occurs in. + label: JoaCarpet mod version + description: The JoaCarpet mod version(s) where this bug occurs in. placeholder: 1.2.3 validations: required: true diff --git a/build.gradle b/build.gradle index 9fddee9..930f499 100644 --- a/build.gradle +++ b/build.gradle @@ -19,15 +19,14 @@ preprocess { def mc118 = createNode('1.18.2' , 1_18_02, 'yarn') def mc119 = createNode('1.19.4' , 1_19_04, 'yarn') def mc120 = createNode('1.20.2' , 1_20_02, 'yarn') + def mc12004 = createNode('1.20.4' , 1_20_04, 'yarn') def mc121 = createNode('1.21' , 1_21_00, 'yarn') -// mc115.link(mc114, null) -// mc115.link(mc116, null) -// mc116.link(mc117, null) mc117.link(mc118, null) mc118.link(mc119, null) mc119.link(mc120, null) - mc120.link(mc121, null) + mc120.link(mc12004, null) + mc12004.link(mc121, null) } tasks.register('buildAndGather') { diff --git a/gradle.properties b/gradle.properties index 9860961..2f33ef8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ # Mod Properties mod_id=joacarpet mod_name=JoaCarpet - mod_version=2.3 + mod_version=2.3.2 maven_group=me.fallenbreath archives_base_name=joacarpet diff --git a/settings.json b/settings.json index 13aaab3..00d3abf 100644 --- a/settings.json +++ b/settings.json @@ -4,6 +4,7 @@ "1.18.2", "1.19.4", "1.20.2", + "1.20.4", "1.21" ] } \ No newline at end of file diff --git a/src/main/java/com/joacarpet/mixin/insaneBehaviors/ContainersMixin.java b/src/main/java/com/joacarpet/mixin/insaneBehaviors/ContainersMixin.java index a534cff..4e1eeb2 100644 --- a/src/main/java/com/joacarpet/mixin/insaneBehaviors/ContainersMixin.java +++ b/src/main/java/com/joacarpet/mixin/insaneBehaviors/ContainersMixin.java @@ -64,7 +64,7 @@ private static void setDeltaMovement(ItemEntity itemEntity, double d, double e, Vec3 velocity = switch (JoaCarpetSettings.insaneBehaviors) { // net.minecraft.world.Containers.dropItemStack, Line 11 case "sensible" -> mapUnitVelocityToVec3( - new ArrayList<>(unitVelocity.subList(0, 2)), + new ArrayList<>(unitVelocity.subList(0, 3)), 1, 0.0, 0.11485000171139836, 0.2, 0.11485000171139836, diff --git a/src/main/java/com/joacarpet/mixin/insaneBehaviors/ProjectileMixin.java b/src/main/java/com/joacarpet/mixin/insaneBehaviors/ProjectileMixin.java index 857c30d..c0da60d 100644 --- a/src/main/java/com/joacarpet/mixin/insaneBehaviors/ProjectileMixin.java +++ b/src/main/java/com/joacarpet/mixin/insaneBehaviors/ProjectileMixin.java @@ -28,7 +28,6 @@ import net.minecraft.world.phys.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; import java.util.ArrayList; @@ -37,8 +36,8 @@ @Mixin(Projectile.class) public class ProjectileMixin { @WrapOperation( - //#if MC >= 12100 - method = "getMovementToShoot" + //#if MC >= 12005 + method = "getMovementToShoot" //#else //$$ method = "shoot" //#endif diff --git a/src/main/java/com/joacarpet/mixin/insaneBehaviors/VehicleEntityOrAbstractMinecartMixin.java b/src/main/java/com/joacarpet/mixin/insaneBehaviors/VehicleEntityOrAbstractMinecartMixin.java index d979ef1..5f37b40 100644 --- a/src/main/java/com/joacarpet/mixin/insaneBehaviors/VehicleEntityOrAbstractMinecartMixin.java +++ b/src/main/java/com/joacarpet/mixin/insaneBehaviors/VehicleEntityOrAbstractMinecartMixin.java @@ -27,7 +27,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; -//#if MC >= 12100 +//#if MC >= 12003 import net.minecraft.world.entity.vehicle.VehicleEntity; //#else //$$ import net.minecraft.world.entity.vehicle.AbstractMinecart; @@ -38,8 +38,7 @@ import java.util.ArrayList; -//#if MC >= 12100 - +//#if MC >= 12003 @Mixin(VehicleEntity.class) public class VehicleEntityOrAbstractMinecartMixin { @WrapOperation( @@ -49,20 +48,19 @@ public class VehicleEntityOrAbstractMinecartMixin { target = "Lnet/minecraft/world/entity/vehicle/VehicleEntity;spawnAtLocation(Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity;" ) ) - //#else //$$ @Mixin(AbstractMinecart.class) //$$ public class VehicleEntityOrAbstractMinecartMixin { -//$$ @WrapOperation( -//$$ method = "Lnet/minecraft/world/entity/vehicle/AbstractMinecart;destroy(Lnet/minecraft/world/damagesource/DamageSource;)V", -//$$ at = @At( -//$$ value = "INVOKE", -//$$ target = "Lnet/minecraft/world/entity/vehicle/AbstractMinecart;spawnAtLocation(Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity;" -//$$ ) -//$$ ) +//$$ @WrapOperation( +//$$ method = "Lnet/minecraft/world/entity/vehicle/AbstractMinecart;destroy(Lnet/minecraft/world/damagesource/DamageSource;)V", +//$$ at = @At( +//$$ value = "INVOKE", +//$$ target = "Lnet/minecraft/world/entity/vehicle/AbstractMinecart;spawnAtLocation(Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity;" +//$$ ) +//$$ ) //#endif private ItemEntity spawnAtLocation( - //#if MC >= 12100 + //#if MC >= 12003 VehicleEntity //#else //$$ AbstractMinecart diff --git a/versions/1.20.2/gradle.properties b/versions/1.20.2/gradle.properties index 19aac30..e001de9 100644 --- a/versions/1.20.2/gradle.properties +++ b/versions/1.20.2/gradle.properties @@ -4,14 +4,14 @@ yarn_mappings=1.20.2+build.4 # Jar build filename version - minecraft_display_version=1.20.x + minecraft_display_version=1.20.0-1.20.2 # Fabric Mod Metadata minecraft_dependency=1.20.x # Build Information # The target mc versions for the mod during mod publishing, separated with \n - game_versions=1.20.3\n1.20.2\n1.20.1\n1.20.0\n1.20 + game_versions=1.20.2\n1.20.1\n1.20.0\n1.20 # Dependencies # fabric_api_version=0.91.3+1.20.4 diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties new file mode 100644 index 0000000..0b49c77 --- /dev/null +++ b/versions/1.20.4/gradle.properties @@ -0,0 +1,21 @@ +# Fabric Properties + # check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 + +# Jar build filename version + minecraft_display_version=1.20.3-1.20.4 + +# Fabric Mod Metadata + minecraft_dependency=1.20.x + +# Build Information + # The target mc versions for the mod during mod publishing, separated with \n + game_versions=1.20.4\n1.20.3 + +# Dependencies + # fabric_api_version=0.91.3+1.20.4 + +# https://masa.dy.fi/maven/carpet/fabric-carpet/ +carpet_core_version=1.4.128+v231205 +carpet_minecraft_version=1.20.3