Skip to content

Commit a0feaf6

Browse files
RyoramaRyorama
committed
Nearly Finish Mappings Change
1 parent 92288ee commit a0feaf6

19 files changed

+631
-753
lines changed

‎common/src/main/java/com/ryorama/terrariamod/TerrariaMod.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import dev.architectury.registry.registries.RegistrySupplier;
1111
import me.shedaniel.autoconfig.AutoConfig;
1212
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
13-
import net.minecraft.registry.RegistryKeys;
14-
import net.minecraft.util.Identifier;
15-
import net.minecraft.world.gen.chunk.ChunkGenerator;
13+
import net.minecraft.core.registries.Registries;
14+
import net.minecraft.resources.ResourceLocation;
15+
import net.minecraft.world.level.chunk.ChunkGenerator;
1616
import org.apache.logging.log4j.LogManager;
1717
import org.apache.logging.log4j.Logger;
1818

@@ -23,7 +23,7 @@ public class TerrariaMod {
2323
public static final Logger LOGGER = LogManager.getLogger(TerrariaMod.class);
2424
public static TerrariaModConfig CONFIG = new TerrariaModConfig();
2525

26-
public static final DeferredRegister<Codec<? extends ChunkGenerator>> CHUNK_GENERATORS = DeferredRegister.create(TerrariaMod.MOD_ID, RegistryKeys.CHUNK_GENERATOR);
26+
public static final DeferredRegister<Codec<? extends ChunkGenerator>> CHUNK_GENERATORS = DeferredRegister.create(TerrariaMod.MOD_ID, Registries.CHUNK_GENERATOR);
2727

2828
public static final RegistrySupplier<Codec<? extends ChunkGenerator>> TERRARIA_CHUNK_GENERATOR = registerChunkGenerator("terraria_chunk_generator", () -> TerrariaChunkGenerator.CODEC);
2929

@@ -38,6 +38,6 @@ public static void init() {
3838
}
3939

4040
static RegistrySupplier<Codec<? extends ChunkGenerator>> registerChunkGenerator(String name, Supplier<Codec<? extends ChunkGenerator>> generator) {
41-
return CHUNK_GENERATORS.register(new Identifier(TerrariaMod.MOD_ID, name), generator);
41+
return CHUNK_GENERATORS.register(new ResourceLocation(TerrariaMod.MOD_ID, name), generator);
4242
}
4343
}

‎common/src/main/java/com/ryorama/terrariamod/mixin/FlowingMixin.java

+26-30
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,47 @@
33
import com.ryorama.terrariamod.TerrariaMod;
44
import com.ryorama.terrariamod.fluids.FlowLava;
55
import com.ryorama.terrariamod.fluids.FlowWater;
6-
import net.minecraft.block.BlockState;
7-
import net.minecraft.fluid.*;
8-
import net.minecraft.util.math.BlockPos;
9-
import net.minecraft.util.math.Direction;
10-
import net.minecraft.world.BlockView;
11-
import net.minecraft.world.World;
12-
import net.minecraft.world.WorldAccess;
6+
import net.minecraft.core.BlockPos;
7+
import net.minecraft.core.Direction;
8+
import net.minecraft.world.level.BlockGetter;
9+
import net.minecraft.world.level.Level;
10+
import net.minecraft.world.level.LevelAccessor;
11+
import net.minecraft.world.level.block.state.BlockState;
12+
import net.minecraft.world.level.material.*;
1313
import org.spongepowered.asm.mixin.Mixin;
1414
import org.spongepowered.asm.mixin.injection.At;
1515
import org.spongepowered.asm.mixin.injection.Inject;
1616
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1717
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1818

19-
@Mixin(FlowableFluid.class)
19+
@Mixin(FlowingFluid.class)
2020
public abstract class FlowingMixin extends Fluid {
2121

22-
@Inject(at = @At("HEAD"), method = "canFlowThrough", cancellable = true)
23-
private void canFlowThrough(BlockView world, Fluid fluid, BlockPos pos, BlockState state, Direction face, BlockPos fromPos, BlockState fromState, FluidState fluidState, CallbackInfoReturnable<Boolean> bruh) {
22+
@Inject(at = @At("HEAD"), method = "canPassThrough", cancellable = true)
23+
private void canPassThrough(BlockGetter world, Fluid fluid, BlockPos pos, BlockState state, Direction face, BlockPos fromPos, BlockState fromState, FluidState fluidState, CallbackInfoReturnable<Boolean> bruh) {
2424
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
2525
if (fluid instanceof WaterFluid || fluid instanceof LavaFluid) {
2626
bruh.setReturnValue(false);
2727
}
2828
}
2929
}
3030

31-
@Inject(at = @At("HEAD"), method = "canFlow", cancellable = true)
32-
private void canFlow(BlockView world, BlockPos fluidPos, BlockState fluidBlockState, Direction flowDirection, BlockPos flowTo, BlockState flowToBlockState, FluidState fluidState, Fluid fluid, CallbackInfoReturnable<Boolean> bruh) {
31+
@Inject(at = @At("HEAD"), method = "canSpreadTo", cancellable = true)
32+
private void canSpreadTo(BlockGetter world, BlockPos fluidPos, BlockState fluidBlockState, Direction flowDirection, BlockPos flowTo, BlockState flowToBlockState, FluidState fluidState, Fluid fluid, CallbackInfoReturnable<Boolean> bruh) {
3333
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
3434
if (fluid instanceof WaterFluid || fluid instanceof LavaFluid) {
3535
bruh.setReturnValue(false);
3636
}
3737
}
3838
}
3939

40-
@Inject(at = @At("HEAD"), method = "tryFlow", cancellable = true)
41-
private void tryFlow(World world, BlockPos fluidPos, FluidState state, CallbackInfo info) {
40+
@Inject(at = @At("HEAD"), method = "spread", cancellable = true)
41+
private void spread(Level world, BlockPos fluidPos, FluidState state, CallbackInfo info) {
4242
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
43-
if ((state.getFluid() instanceof WaterFluid.Flowing || state.getFluid() instanceof LavaFluid.Flowing || (state.getFluid() instanceof WaterFluid.Still || state.getFluid() instanceof LavaFluid.Still))) {
44-
if (state.getFluid() instanceof WaterFluid) {
43+
if ((state.getType() instanceof WaterFluid.Flowing || state.getType() instanceof LavaFluid.Flowing || (state.getType() instanceof WaterFluid.Source || state.getType() instanceof LavaFluid.Source))) {
44+
if (state.getType() instanceof WaterFluid) {
4545
FlowWater.flowwater(world, fluidPos, state);
46-
} else if (state.getFluid() instanceof LavaFluid) {
46+
} else if (state.getType() instanceof LavaFluid) {
4747
FlowLava.flowlava(world, fluidPos, state);
4848
}
4949

@@ -52,23 +52,23 @@ private void tryFlow(World world, BlockPos fluidPos, FluidState state, CallbackI
5252
}
5353
}
5454

55-
@Inject(at = @At("HEAD"), method = "getUpdatedState", cancellable = true)
56-
private void getUpdatedState(World world, BlockPos pos, BlockState state, CallbackInfoReturnable<FluidState> info) {
55+
@Inject(at = @At("HEAD"), method = "getNewLiquid", cancellable = true)
56+
private void getNewLiquid(Level world, BlockPos pos, BlockState state, CallbackInfoReturnable<FluidState> info) {
5757
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
5858
FluidState fluidstate = state.getFluidState();
59-
if (fluidstate.getFluid() instanceof WaterFluid.Flowing || fluidstate.getFluid() instanceof LavaFluid.Flowing) {
59+
if (fluidstate.getType() instanceof WaterFluid.Flowing || fluidstate.getType() instanceof LavaFluid.Flowing) {
6060

61-
if (fluidstate.getFluid() instanceof WaterFluid) {
62-
info.setReturnValue(Fluids.FLOWING_WATER.getFlowing(state.getFluidState().getLevel(), false));
63-
} else if (fluidstate.getFluid() instanceof LavaFluid) {
64-
info.setReturnValue(Fluids.FLOWING_LAVA.getFlowing(state.getFluidState().getLevel(), false));
61+
if (fluidstate.getType() instanceof WaterFluid) {
62+
info.setReturnValue(Fluids.FLOWING_WATER.getFlowing(state.getFluidState().getAmount(), false));
63+
} else if (fluidstate.getType() instanceof LavaFluid) {
64+
info.setReturnValue(Fluids.FLOWING_LAVA.getFlowing(state.getFluidState().getAmount(), false));
6565
}
6666
}
6767
}
6868
}
6969

70-
@Inject(at = @At("HEAD"), method = "flow", cancellable = true)
71-
public void flow(WorldAccess world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState, CallbackInfo ci) {
70+
@Inject(at = @At("HEAD"), method = "spreadTo", cancellable = true)
71+
public void spreadTo(LevelAccessor world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState, CallbackInfo ci) {
7272
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
7373
if (direction == Direction.DOWN) {
7474
FluidState fluidState2 = world.getFluidState(pos);
@@ -79,8 +79,4 @@ public void flow(WorldAccess world, BlockPos pos, BlockState state, Direction di
7979
}
8080
}
8181
}
82-
83-
private void playExtinguishEvent(WorldAccess world, BlockPos pos) {
84-
world.syncWorldEvent(1501, pos, 0);
85-
}
8682
}

‎common/src/main/java/com/ryorama/terrariamod/mixin/IntValueInvoker.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.ryorama.terrariamod.mixin;
22

33
import net.minecraft.server.MinecraftServer;
4-
import net.minecraft.world.GameRules;
4+
import net.minecraft.world.level.GameRules;
55
import org.spongepowered.asm.mixin.Mixin;
66
import org.spongepowered.asm.mixin.gen.Invoker;
77

88
import java.util.function.BiConsumer;
99

10-
@Mixin(GameRules.IntRule.class)
10+
@Mixin(GameRules.IntegerValue.class)
1111
public interface IntValueInvoker {
1212

1313
@Invoker("create")
14-
static GameRules.Type<GameRules.IntRule> invokeCreate(int defaultValue, BiConsumer<MinecraftServer, GameRules.IntRule> onChanged) {
14+
static GameRules.Type<GameRules.IntegerValue> invokeCreate(int defaultValue, BiConsumer<MinecraftServer, GameRules.IntegerValue> onChanged) {
1515
throw new AssertionError();
1616
}
1717
}

‎common/src/main/java/com/ryorama/terrariamod/mixin/LavaFluidMixin.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.ryorama.terrariamod.mixin;
22

33
import com.ryorama.terrariamod.TerrariaMod;
4-
import net.minecraft.fluid.FlowableFluid;
5-
import net.minecraft.fluid.LavaFluid;
4+
import net.minecraft.world.level.material.FlowingFluid;
5+
import net.minecraft.world.level.material.LavaFluid;
66
import org.spongepowered.asm.mixin.Mixin;
77
import org.spongepowered.asm.mixin.injection.At;
88
import org.spongepowered.asm.mixin.injection.Inject;
99
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1010

1111
@Mixin(LavaFluid.class)
12-
public abstract class LavaFluidMixin extends FlowableFluid {
13-
@Inject(at = @At("HEAD"), method = "isInfinite", cancellable = true)
14-
private void isInfinite(CallbackInfoReturnable<Boolean> info) {
12+
public abstract class LavaFluidMixin extends FlowingFluid {
13+
@Inject(at = @At("HEAD"), method = "canConvertToSource", cancellable = true)
14+
private void canConvertToSource(CallbackInfoReturnable<Boolean> info) {
1515
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
1616
info.setReturnValue(false);
1717
} else {

‎common/src/main/java/com/ryorama/terrariamod/mixin/LivingEntityMixin.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import com.ryorama.terrariamod.buffs.BuffT;
44
import com.ryorama.terrariamod.buffs.BuffsT;
55
import com.ryorama.terrariamod.entities.impl.CustomBuffAccessor;
6-
import net.minecraft.entity.Attackable;
7-
import net.minecraft.entity.Entity;
8-
import net.minecraft.entity.EntityType;
9-
import net.minecraft.entity.LivingEntity;
10-
import net.minecraft.entity.player.PlayerEntity;
11-
import net.minecraft.util.Identifier;
12-
import net.minecraft.world.World;
6+
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraft.world.entity.Attackable;
8+
import net.minecraft.world.entity.Entity;
9+
import net.minecraft.world.entity.EntityType;
10+
import net.minecraft.world.entity.LivingEntity;
11+
import net.minecraft.world.entity.player.Player;
12+
import net.minecraft.world.level.Level;
1313
import org.spongepowered.asm.mixin.Mixin;
1414
import org.spongepowered.asm.mixin.injection.At;
1515
import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,24 +22,24 @@
2222
public abstract class LivingEntityMixin extends Entity implements Attackable, CustomBuffAccessor {
2323

2424
public List<BuffT> activeBuffs = new ArrayList<>();
25-
public List<Identifier> activeBuffsIcons = new ArrayList<>();
25+
public List<ResourceLocation> activeBuffsIcons = new ArrayList<>();
2626

2727
public boolean calledBuffIconRenderer = false;
2828

29-
public LivingEntityMixin(EntityType<?> type, World world) {
29+
public LivingEntityMixin(EntityType<?> type, Level world) {
3030
super(type, world);
3131
}
3232

3333
@Inject(at = @At("TAIL"), method = "tick")
3434
public void tick(CallbackInfo info) {
3535
LivingEntity thisEntity = ((LivingEntity) (Object) this);
3636

37-
if (thisEntity instanceof PlayerEntity) {
38-
PlayerEntity player = (PlayerEntity) thisEntity;
39-
World playerWorld = player.getWorld();
37+
if (thisEntity instanceof Player) {
38+
Player player = (Player) thisEntity;
39+
Level playerWorld = player.level();
4040

41-
if (playerWorld.isClient()) {
42-
if (player.isMainPlayer()) {
41+
if (playerWorld.isClientSide()) {
42+
if (player.isLocalPlayer()) {
4343
if (!calledBuffIconRenderer) {
4444
BuffT.renderIcon(thisEntity);
4545
calledBuffIconRenderer = true;
@@ -63,7 +63,7 @@ public List<BuffT> GetActiveBuffs() {
6363
}
6464

6565
@Override
66-
public List<Identifier> GetActiveBuffIcons() {
66+
public List<ResourceLocation> GetActiveBuffIcons() {
6767
return activeBuffsIcons;
6868
}
6969

‎common/src/main/java/com/ryorama/terrariamod/mixin/WaterFluidMixin.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.ryorama.terrariamod.mixin;
22

33
import com.ryorama.terrariamod.TerrariaMod;
4-
import net.minecraft.fluid.FlowableFluid;
5-
import net.minecraft.fluid.WaterFluid;
4+
import net.minecraft.world.level.material.FlowingFluid;
5+
import net.minecraft.world.level.material.WaterFluid;
66
import org.spongepowered.asm.mixin.Mixin;
77
import org.spongepowered.asm.mixin.injection.At;
88
import org.spongepowered.asm.mixin.injection.Inject;
99
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1010

1111
@Mixin(WaterFluid.class)
12-
public abstract class WaterFluidMixin extends FlowableFluid {
13-
@Inject(at = @At("HEAD"), method = "isInfinite", cancellable = true)
14-
private void isInfinite(CallbackInfoReturnable<Boolean> info) {
12+
public abstract class WaterFluidMixin extends FlowingFluid {
13+
@Inject(at = @At("HEAD"), method = "canConvertToSource", cancellable = true)
14+
private void canConvertToSource(CallbackInfoReturnable<Boolean> info) {
1515
if (!TerrariaMod.CONFIG.useVanillaFluidPhysics) {
1616
info.setReturnValue(false);
1717
} else {

0 commit comments

Comments
 (0)