Skip to content

Commit

Permalink
1.21.2 update + 2.0.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
topi-banana committed Oct 22, 2024
1 parent 8e5993c commit 6ab6a6f
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 10 deletions.
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ plugins {
}

preprocess {
def mc119 = createNode('1.19.4', 1_19_04, '')
def mc1194 = createNode('1.19.4', 1_19_04, '')
def mc1201 = createNode('1.20.1', 1_20_01, '')
def mc1202 = createNode('1.20.2', 1_20_02, '')
def mc1206 = createNode('1.20.6', 1_20_06, '')
def mc121 = createNode('1.21.1', 1_21_01, '')
def mc1211 = createNode('1.21.1', 1_21_01, '')
def mc1212 = createNode('1.21.2', 1_21_02, '')

mc119.link(mc1201, null)
mc1194.link(mc1201, null)
mc1201.link(mc1202, null)
mc1202.link(mc1206, null)
mc1206.link(mc121, null)
mc1206.link(mc1211, null)
mc1211.link(mc1212, null)
}

tasks.register('buildAndGather') {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

# Fabric Basic Properties
# https://fabricmc.net/versions.html
loader_version=0.16.3
loader_version=0.16.7

# Mod Properties
mod_id=vulpeus_carpet
mod_name=VulpeusCarpet
mod_version=2.0.3
mod_version=2.0.4
maven_group=com.vulpeus
archives_base_name=vulpeus_carpet

Expand Down
3 changes: 2 additions & 1 deletion settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"1.20.1",
"1.20.2",
"1.20.6",
"1.21.1"
"1.21.1",
"1.21.2"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(ArmorStandEntity.class)
public abstract class MixinArmorStandEntity extends LivingEntity implements SitEntity {

@Unique
private boolean sitEntity = false;

protected MixinArmorStandEntity(EntityType<? extends LivingEntity> entityType, World world) {
Expand All @@ -62,7 +64,7 @@ public void setSitEntity(boolean isSitEntity) {
protected void removePassenger(Entity passenger) {
if (this.isSitEntity()) {
this.setPosition(this.getX(), this.getY() + 0.16, this.getZ());
this.kill();
this.remove(RemovalReason.KILLED);
}
super.removePassenger(passenger);
}
Expand Down
2 changes: 1 addition & 1 deletion versions/1.21.1/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Fabric Mod Metadata
carpet_dependency=>=1.4.147
minecraft_dependency=1.21.x
minecraft_dependency=>=1.21 <=1.21.1

# Build Information
# The target mc versions for the mod during mod publishing, separated with \n
Expand Down
18 changes: 18 additions & 0 deletions versions/1.21.2/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Fabric Properties
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.2
minecraft_version=1.21.2
yarn_mappings=1.21.2+build.1

# Fabric Mod Metadata
carpet_dependency=>=1.4.157
minecraft_dependency=>=1.21.2

# Build Information
# The target mc versions for the mod during mod publishing, separated with \n
game_versions=1.21.2

# Dependencies
fabric_api_version=0.106.1+1.21.2
carpet_version=1.21.2-pre3-1.4.157+v241014
carpet_fixes_version=
carpet_tis_version=
2 changes: 1 addition & 1 deletion versions/mainProject
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.1
1.21.2

0 comments on commit 6ab6a6f

Please sign in to comment.