Skip to content

Commit

Permalink
Add dedicated 1.20.3-1.20.4 release.
Browse files Browse the repository at this point in the history
Fix crash when using container minecarts with contents using insaneBehaviors sensible
Bump version number to 2.3.2
  • Loading branch information
JoakimThorsen committed Jul 18, 2024
1 parent db17951 commit 6a892bb
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"1.18.2",
"1.19.4",
"1.20.2",
"1.20.4",
"1.21"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,8 +38,7 @@

import java.util.ArrayList;

//#if MC >= 12100

//#if MC >= 12003
@Mixin(VehicleEntity.class)
public class VehicleEntityOrAbstractMinecartMixin {
@WrapOperation(
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions versions/1.20.2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions versions/1.20.4/gradle.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6a892bb

Please sign in to comment.