Skip to content

Commit 212b171

Browse files
rubensworksrubensworks
committed
Update to MC 26.1.2
1 parent 3e23dc6 commit 212b171

33 files changed

Lines changed: 213 additions & 190 deletions

‎build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,16 @@ dependencies {
137137
}
138138

139139
// Add something like 'integrateddynamicscompat_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local Integrated Dynamics Compat version.
140-
if(secrets.integrateddynamicscompat_version_local) {
141-
shadow("org.cyclops.integrateddynamicscompat:integrateddynamicscompat-${project.minecraft_version}-neoforge:${secrets.integrateddynamicscompat_version_local}") {
142-
transitive = false
143-
}
144-
} else {
145-
shadow("org.cyclops.integrateddynamicscompat:integrateddynamicscompat-${project.integrateddynamicscompat_version}") {
146-
transitive = false
147-
}
148-
}
140+
// TODO: restore compat
141+
// if(secrets.integrateddynamicscompat_version_local) {
142+
// shadow("org.cyclops.integrateddynamicscompat:integrateddynamicscompat-${project.minecraft_version}-neoforge:${secrets.integrateddynamicscompat_version_local}") {
143+
// transitive = false
144+
// }
145+
// } else {
146+
// shadow("org.cyclops.integrateddynamicscompat:integrateddynamicscompat-${project.integrateddynamicscompat_version}") {
147+
// transitive = false
148+
// }
149+
// }
149150

150151
if(secrets.commoncapabilities_version_local) {
151152
implementation "org.cyclops.commoncapabilities:commoncapabilities-${project.minecraft_version}-neoforge:${secrets.commoncapabilities_version_local}"

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.cyclops.integrateddynamics
44
java_version=25
55

66
# Common
7-
minecraft_version=26.1.2
7+
minecraft_version=26.2
88
mod_name=IntegratedDynamics
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=integrateddynamics
@@ -19,7 +19,7 @@ curseforge_project_id=236307
1919
modrinth_project_id=yYzdQHJI
2020

2121
# NeoForge
22-
neoforge_version=26.1.2.22-beta
22+
neoforge_version=26.2.0.6-beta
2323
neoforge_loader_version_range=[4,)
2424
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-dynamics.json
2525

@@ -29,6 +29,6 @@ org.gradle.daemon=false
2929
org.gradle.caching=true
3030

3131
# Dependencies
32-
cyclopscore_version=1.29.5-1012
32+
cyclopscore_version=1.30.0-1038
3333
integrateddynamicscompat_version=26.1.2-neoforge:1.0.0-169
34-
commoncapabilities_version=2.11.4-344
34+
commoncapabilities_version=2.11.8-360

‎src/main/java/org/cyclops/integrateddynamics/advancement/criterion/NetworkInitializedTrigger.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.advancements.criterion.ContextAwarePredicate;
6-
import net.minecraft.advancements.criterion.EntityPredicate;
7-
import net.minecraft.advancements.criterion.SimpleCriterionTrigger;
5+
import net.minecraft.advancements.predicates.ContextAwarePredicate;
6+
import net.minecraft.advancements.predicates.entity.EntityPredicate;
7+
import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.neoforged.bus.api.SubscribeEvent;
1010
import net.neoforged.neoforge.common.NeoForge;

‎src/main/java/org/cyclops/integrateddynamics/advancement/criterion/PartReaderAspectTrigger.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.advancements.criterion.ContextAwarePredicate;
6-
import net.minecraft.advancements.criterion.EntityPredicate;
7-
import net.minecraft.advancements.criterion.SimpleCriterionTrigger;
5+
import net.minecraft.advancements.predicates.ContextAwarePredicate;
6+
import net.minecraft.advancements.predicates.entity.EntityPredicate;
7+
import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.neoforged.bus.api.SubscribeEvent;
1010
import net.neoforged.neoforge.common.NeoForge;

‎src/main/java/org/cyclops/integrateddynamics/advancement/criterion/PartVariableDrivenAspectTrigger.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.advancements.criterion.ContextAwarePredicate;
6-
import net.minecraft.advancements.criterion.EntityPredicate;
7-
import net.minecraft.advancements.criterion.SimpleCriterionTrigger;
5+
import net.minecraft.advancements.predicates.ContextAwarePredicate;
6+
import net.minecraft.advancements.predicates.entity.EntityPredicate;
7+
import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.neoforged.bus.api.SubscribeEvent;
1010
import net.neoforged.neoforge.common.NeoForge;

‎src/main/java/org/cyclops/integrateddynamics/advancement/criterion/PartWriterAspectTrigger.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.advancements.criterion.ContextAwarePredicate;
6-
import net.minecraft.advancements.criterion.EntityPredicate;
7-
import net.minecraft.advancements.criterion.SimpleCriterionTrigger;
5+
import net.minecraft.advancements.predicates.ContextAwarePredicate;
6+
import net.minecraft.advancements.predicates.entity.EntityPredicate;
7+
import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
88
import net.minecraft.server.level.ServerPlayer;
99
import net.neoforged.bus.api.SubscribeEvent;
1010
import net.neoforged.neoforge.common.NeoForge;

‎src/main/java/org/cyclops/integrateddynamics/advancement/criterion/VariableCreatedTrigger.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import net.minecraft.advancements.criterion.ContextAwarePredicate;
6-
import net.minecraft.advancements.criterion.EntityPredicate;
7-
import net.minecraft.advancements.criterion.SimpleCriterionTrigger;
5+
import net.minecraft.advancements.predicates.ContextAwarePredicate;
6+
import net.minecraft.advancements.predicates.entity.EntityPredicate;
7+
import net.minecraft.advancements.triggers.SimpleCriterionTrigger;
88
import net.minecraft.core.registries.BuiltInRegistries;
99
import net.minecraft.server.level.ServerPlayer;
1010
import net.minecraft.world.level.block.Block;

‎src/main/java/org/cyclops/integrateddynamics/block/BlockMechanicalDryingBasin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
1919
import net.minecraft.world.level.block.state.properties.BooleanProperty;
2020
import net.minecraft.world.phys.BlockHitResult;
21-
import net.neoforged.neoforge.transfer.fluid.FluidUtil;
2221
import net.neoforged.neoforge.fluids.SimpleFluidContent;
22+
import net.neoforged.neoforge.transfer.fluid.FluidUtil;
2323
import org.apache.commons.lang3.tuple.Pair;
2424
import org.cyclops.cyclopscore.helper.IModHelpers;
2525
import org.cyclops.integrateddynamics.RegistryEntries;
@@ -64,8 +64,8 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
6464

6565
@Override
6666
public InteractionResult useWithoutItem(BlockState blockState, Level world, BlockPos blockPos, Player player, BlockHitResult rayTraceResult) {
67-
if (FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, Direction.UP)
68-
|| FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, Direction.DOWN)) {
67+
if (FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, Direction.UP, null)
68+
|| FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, Direction.DOWN, null)) {
6969
return InteractionResult.SUCCESS;
7070
}
7171
return super.useWithoutItem(blockState, world, blockPos, player, rayTraceResult);

‎src/main/java/org/cyclops/integrateddynamics/block/BlockMechanicalSqueezer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
6262

6363
@Override
6464
public InteractionResult useWithoutItem(BlockState blockState, Level world, BlockPos blockPos, Player player, BlockHitResult rayTraceResult) {
65-
if (FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, rayTraceResult.getDirection())) {
65+
if (FluidUtil.interactWithFluidHandler(player, player.getUsedItemHand(), world, blockPos, rayTraceResult.getDirection(), null)) {
6666
return InteractionResult.SUCCESS;
6767
}
6868
return super.useWithoutItem(blockState, world, blockPos, player, rayTraceResult);

‎src/main/java/org/cyclops/integrateddynamics/block/BlockSqueezer.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,26 @@ public InteractionResult useWithoutItem(BlockState blockState, Level world, Bloc
137137
}
138138

139139
@Override
140-
public void updateEntityMovementAfterFallOn(BlockGetter worldIn, Entity entityIn) {
140+
public float getBounceRestitution(Level worldIn, BlockPos blockPos, BlockState blockState, Entity entityIn) {
141141
double motionY = entityIn.getDeltaMovement().y;
142-
super.updateEntityMovementAfterFallOn(worldIn, entityIn);
143-
if(!entityIn.level().isClientSide() && motionY <= -0.37D && entityIn instanceof LivingEntity) {
142+
float ret = super.getBounceRestitution(worldIn, blockPos, blockState, entityIn);
143+
if (!entityIn.level().isClientSide() && motionY <= -0.37D && entityIn instanceof LivingEntity) {
144144
// Same way of deriving blockPos as is done in Entity#moveEntity
145145
int i = Mth.floor(entityIn.getX());
146146
int j = Mth.floor(entityIn.getY() - 0.2D);
147147
int k = Mth.floor(entityIn.getZ());
148-
BlockPos blockPos = new BlockPos(i, j, k);
149-
BlockState blockState = worldIn.getBlockState(blockPos);
150148

151149
// The faster the entity is falling, the more steps to advance by
152150
int steps = 1 + Mth.floor((-motionY - 0.37D) * 5);
153151

154-
if (blockState.getBlock() == this) { // Just to be sure...
155-
if((entityIn.getY() - blockPos.getY()) - getRelativeTopPositionTop(worldIn, blockPos, blockState) <= 0.1F) {
156-
int newHeight = Math.min(7, blockState.getValue(HEIGHT) + steps);
157-
entityIn.level().setBlockAndUpdate(blockPos, blockState.setValue(HEIGHT, newHeight));
158-
IModHelpers.get().getBlockEntityHelpers().get(worldIn, blockPos, BlockEntitySqueezer.class)
159-
.ifPresent(tile -> tile.setItemHeight(Math.max(newHeight, tile.getItemHeight())));
160-
}
152+
if((entityIn.getY() - blockPos.getY()) - getRelativeTopPositionTop(worldIn, blockPos, blockState) <= 0.1F) {
153+
int newHeight = Math.min(7, blockState.getValue(HEIGHT) + steps);
154+
entityIn.level().setBlockAndUpdate(blockPos, blockState.setValue(HEIGHT, newHeight));
155+
IModHelpers.get().getBlockEntityHelpers().get(worldIn, blockPos, BlockEntitySqueezer.class)
156+
.ifPresent(tile -> tile.setItemHeight(Math.max(newHeight, tile.getItemHeight())));
161157
}
162158
}
159+
return ret;
163160
}
164161

165162
@Override

0 commit comments

Comments
 (0)