Skip to content

Commit

Permalink
Update to Minecraft 1.20.2-pre4.
Browse files Browse the repository at this point in the history
- Update MixinExtras for better compatibility.
- Add biome remapper data version for 1.20.2.
* Follow changes to BlockPointer in the dispenser code.
  • Loading branch information
gniftygnome committed Sep 13, 2023
1 parent 3ef0aaa commit ba3f4c3
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'idea'
id 'eclipse'
id 'fabric-loom' version '1.3.+'
// id 'io.github.juuxel.loom-quiltflower-mini' version '1.2.1'
// id 'io.github.juuxel.loom-vineflower' version '1.11.0'
}

dependencies {
Expand All @@ -22,7 +22,6 @@ allprojects {
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: 'fabric-loom'
// apply plugin: 'io.github.juuxel.loom-quiltflower-mini'

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand Down Expand Up @@ -56,7 +55,7 @@ allprojects {
createRemapConfigurations(sourceSets.testmod)
}

// quiltflower {
// vineflower {
// addToRuntimeClasspath.set(true)
// }

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ fabric.loom.multiProjectOptimisation=true
maven_group=com.terraformersmc.terraform-api
version=8.0.0-alpha.1

minecraft_version=23w31a
yarn_mappings=23w31a+build.12
minecraft_version=1.20.2-pre4
yarn_mappings=1.20.2-pre4+build.1
loader_version=0.14.22
fabric_version=0.86.1+1.20.2
fabric_version=0.88.4+1.20.2

mixin_extras_version=0.2.0-beta.5
mixinextras_version=0.2.0-rc.2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ private DataVersions() {
return;
}

public static final int V_1_20_2 = 3572;
public static final int V_1_20_1 = 3464;
public static final int V_1_20 = 3454;
public static final int V_1_19_4 = 3330;
Expand Down
3 changes: 1 addition & 2 deletions terraform-dirt-api-v1/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
archivesBaseName = "terraform-dirt-api-v1"

dependencies {
include(modImplementation("com.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}"))
annotationProcessor("com.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
}
3 changes: 1 addition & 2 deletions terraform-wood-api-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ dependencies {
testmodImplementation project(path: ":terraform-wood-api-v1", configuration: "namedElements")
modTestmodImplementation fabricApi.module("fabric-item-group-api-v1", project.fabric_version)

include(modImplementation("com.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}"))
annotationProcessor("com.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import net.minecraft.util.math.BlockPointer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;

/**
Expand All @@ -39,10 +40,11 @@ public TerraformBoatDispenserBehavior(RegistryKey<TerraformBoatType> boatKey, bo
@Override
public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
Direction facing = pointer.getBlockState().get(DispenserBlock.FACING);
Vec3d centerPos = pointer.method_53906();

double x = pointer.getX() + facing.getOffsetX() * OFFSET_MULTIPLIER;
double y = pointer.getY() + facing.getOffsetY() * OFFSET_MULTIPLIER;
double z = pointer.getZ() + facing.getOffsetZ() * OFFSET_MULTIPLIER;
double x = centerPos.getX() + facing.getOffsetX() * OFFSET_MULTIPLIER;
double y = centerPos.getY() + facing.getOffsetY() * OFFSET_MULTIPLIER;
double z = centerPos.getZ() + facing.getOffsetZ() * OFFSET_MULTIPLIER;

World world = pointer.getWorld();
BlockPos pos = pointer.getPos().offset(facing);
Expand Down

0 comments on commit ba3f4c3

Please sign in to comment.