Skip to content

Commit

Permalink
Merge pull request #4 from orifu/1.20.6
Browse files Browse the repository at this point in the history
port to 1.20.6
  • Loading branch information
ix0rai authored May 29, 2024
2 parents 7711f92 + fba4653 commit df4dbf7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ dependencies {

implementation("folk.sisby:kaleido-config:0.3.1+1.3.1")
include("folk.sisby:kaleido-config:0.3.1+1.3.1")

modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
}

processResources {
Expand Down
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

minecraft_version=1.20.4
quilt_mappings=1
loader_version=0.14.21
modmenu_version=9.0.0
minecraft_version=1.20.6
quilt_mappings=6
loader_version=0.15.6
fabric_version=0.97.8+1.20.6
modmenu_version=10.0.0-beta.1

mod_version = 1.0.3+mc1.20.4
mod_version = 1.0.3+mc1.20.6
maven_group = io.ix0rai
archives_base_name = ramel
2 changes: 1 addition & 1 deletion src/main/java/io/ix0rai/ramel/mixin/CamelEntityMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected CamelEntityMixin(EntityType<? extends CamelEntity> entityType, World w

DamageSource source = this.getDamageSources().mobAttack(this.getPrimaryPassenger() != null ? this.getPrimaryPassenger() : this);

this.getWorld().getOtherEntities(this, getBoundingBox().expand(rammingRange), Entity::isAlive).stream()
this.getWorld().getOtherEntities(this, this.getBounds().expand(rammingRange), Entity::isAlive).stream()
.filter(e -> e instanceof LivingEntity && !this.getPassengerList().contains(e))
.forEach(e -> {
LivingEntity entity = (LivingEntity) e;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
],

"depends": {
"fabricloader": ">=0.14.14",
"minecraft": "=1.20.4"
"fabricloader": ">=0.15.6",
"minecraft": ">=1.20.6"
},

"custom": {
Expand Down

0 comments on commit df4dbf7

Please sign in to comment.