Skip to content

Commit 92288ee

Browse files
RyoramaRyorama
committed
Start changing to Mojang provided mappings
1 parent 75d19d9 commit 92288ee

File tree

90 files changed

+1156
-1222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1156
-1222
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ subprojects {
2020

2121
dependencies {
2222
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
23-
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
23+
mappings loom.officialMojangMappings()
2424
}
2525

2626
build.finalizedBy(mergeJars)

‎common/src/main/java/com/ryorama/terrariamod/blocks/BlocksT.java

+111-112
Large diffs are not rendered by default.

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/BlockT.java

+18-21
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
import com.ryorama.terrariamod.blocks.BlocksT;
44
import com.ryorama.terrariamod.items.impl.*;
5-
import net.minecraft.block.Block;
6-
import net.minecraft.block.BlockState;
7-
import net.minecraft.block.entity.BlockEntity;
8-
import net.minecraft.entity.player.PlayerEntity;
9-
import net.minecraft.item.ItemStack;
10-
import net.minecraft.util.math.BlockPos;
11-
import net.minecraft.world.BlockView;
12-
import net.minecraft.world.World;
13-
import net.minecraft.world.WorldAccess;
14-
import org.jetbrains.annotations.Nullable;
5+
import net.minecraft.core.BlockPos;
6+
import net.minecraft.world.entity.player.Player;
7+
import net.minecraft.world.level.BlockGetter;
8+
import net.minecraft.world.level.LevelAccessor;
9+
import net.minecraft.world.level.block.Block;
10+
import net.minecraft.world.level.block.state.BlockBehaviour;
11+
import net.minecraft.world.level.block.state.BlockState;
1512

1613
import java.util.ArrayList;
1714
import java.util.Random;
@@ -37,15 +34,15 @@ public class BlockT extends Block {
3734
public String name;
3835
public String shape = "";
3936

40-
protected ArrayList<String> allowed = new ArrayList<String>();
37+
protected ArrayList<String> allowed = new ArrayList<>();
4138

42-
public BlockT(Settings properties, float hardness, float difficulty) {
43-
super(properties.hardness(hardness * 0.03f));
39+
public BlockT(BlockBehaviour.Properties properties, float hardness, float difficulty) {
40+
super(properties.destroyTime(hardness * 0.03f));
4441
this.difficulty = difficulty;
4542
}
4643

47-
public BlockT(Settings properties, float hardness, float difficulty, int luminance) {
48-
super(properties.hardness(hardness * 0.03f).nonOpaque().luminance(new ToIntFunction<BlockState>() {
44+
public BlockT(BlockBehaviour.Properties properties, float hardness, float difficulty, int luminance) {
45+
super(properties.destroyTime(hardness * 0.03f).noOcclusion().lightLevel(new ToIntFunction<BlockState>() {
4946
@Override
5047
public int applyAsInt(BlockState value) {
5148
return luminance;
@@ -87,13 +84,13 @@ public BlockT setAxe(boolean axe) {
8784
}
8885

8986
@Override
90-
public void onBroken(WorldAccess world, BlockPos pos, BlockState state) {
87+
public void onBroken(LevelAccessor world, BlockPos pos, BlockState state) {
9188
for (int t = 0; t <= 20; t++) {
9289
BlockPos abovePos = new BlockPos(pos.getX(), pos.getY() + t, pos.getZ());
9390
Block aboveBlock = world.getBlockState(abovePos).getBlock();
9491

9592
if (aboveBlock instanceof PlantT && aboveBlock != BlocksT.VINE.get() || aboveBlock instanceof TreeSegment) {
96-
world.breakBlock(abovePos, true);
93+
world.destroyBlock(abovePos, true);
9794
}
9895
}
9996

@@ -102,15 +99,15 @@ public void onBroken(WorldAccess world, BlockPos pos, BlockState state) {
10299
Block bottomBlock = world.getBlockState(bottomPos).getBlock();
103100

104101
if (bottomBlock == BlocksT.VINE.get()) {
105-
world.breakBlock(bottomPos, false);
102+
world.destroyBlock(bottomPos, false);
106103
}
107104
}
108105
}
109106

110107
@Override
111-
public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) {
112-
if (player.getMainHandStack().getItem() instanceof ItemT || player.getMainHandStack().getItem() instanceof PickaxeT || player.getMainHandStack().getItem() instanceof AxeT || player.getMainHandStack().getItem() instanceof ShortswordT || player.getMainHandStack().getItem() instanceof BroadswordT) {
113-
return getMiningSpeed((ItemT) player.getMainHandStack().getItem());
108+
public float calcBlockBreakingDelta(BlockState state, Player player, BlockGetter world, BlockPos pos) {
109+
if (player.getMainHandItem().getItem() instanceof ItemT || player.getMainHandItem().getItem() instanceof PickaxeT || player.getMainHandStack().getItem() instanceof AxeT || player.getMainHandItem().getItem() instanceof ShortswordT || player.getMainHandItem().getItem() instanceof BroadswordT) {
110+
return getMiningSpeed((ItemT) player.getMainHandItem().getItem());
114111
} else {
115112
return -1;
116113
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/CMBlockT.java

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
11
package com.ryorama.terrariamod.blocks.impl;
22

3-
import net.minecraft.block.AbstractBlock;
4-
import net.minecraft.block.BlockState;
5-
import net.minecraft.block.ShapeContext;
6-
import net.minecraft.util.math.BlockPos;
7-
import net.minecraft.util.shape.VoxelShape;
8-
import net.minecraft.util.shape.VoxelShapes;
9-
import net.minecraft.world.BlockView;
10-
import net.minecraft.world.World;
3+
import net.minecraft.core.BlockPos;
4+
import net.minecraft.world.level.BlockGetter;
5+
import net.minecraft.world.level.block.state.BlockBehaviour;
6+
import net.minecraft.world.level.block.state.BlockState;
7+
import net.minecraft.world.phys.shapes.CollisionContext;
8+
import net.minecraft.world.phys.shapes.Shapes;
9+
import net.minecraft.world.phys.shapes.VoxelShape;
1110

12-
import java.util.Random;
1311
import java.util.function.ToIntFunction;
1412

1513
public class CMBlockT extends BlockT {
16-
public CMBlockT(AbstractBlock.Settings properties, float hardness, float difficulty) {
17-
super(properties.nonOpaque().noCollision().notSolid(), hardness, difficulty);
14+
public CMBlockT(BlockBehaviour.Properties properties, float hardness, float difficulty) {
15+
super(properties.noOcclusion().noCollission().forceSolidOff(), hardness, difficulty);
1816
}
1917

20-
public CMBlockT(AbstractBlock.Settings properties, float hardness, float difficulty, int luminance) {
21-
super(properties.nonOpaque().noCollision().luminance(new ToIntFunction<BlockState>() {
18+
public CMBlockT(BlockBehaviour.Properties properties, float hardness, float difficulty, int luminance) {
19+
super(properties.noOcclusion().noCollission().lightLevel(new ToIntFunction<BlockState>() {
2220
@Override
2321
public int applyAsInt(BlockState value) {
2422
return luminance;
2523
}
2624
}), hardness, difficulty);
2725
}
2826

29-
public boolean isFullCube(BlockView world, BlockPos pos) {
27+
public boolean isFullCube(BlockGetter world, BlockPos pos) {
3028
return false;
3129
}
3230

33-
public int getOpacity(BlockState state, BlockView world, BlockPos pos) {
31+
public int getOpacity(BlockState state, BlockGetter world, BlockPos pos) {
3432
return 0;
3533
}
3634

37-
public VoxelShape getOutlineShape(BlockView world, BlockPos pos, ShapeContext context) {
38-
return VoxelShapes.empty();
35+
public VoxelShape getOutlineShape(BlockGetter world, BlockPos pos, CollisionContext context) {
36+
return Shapes.empty();
3937
}
4038
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/ChestT.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package com.ryorama.terrariamod.blocks.impl;
2-
import net.minecraft.block.ChestBlock;
3-
import net.minecraft.block.entity.BlockEntityType;
4-
import net.minecraft.block.entity.ChestBlockEntity;
5-
import net.minecraft.util.Identifier;
2+
3+
import net.minecraft.resources.ResourceLocation;
4+
import net.minecraft.world.level.block.ChestBlock;
5+
import net.minecraft.world.level.block.entity.BlockEntityType;
6+
import net.minecraft.world.level.block.entity.ChestBlockEntity;
7+
import net.minecraft.world.level.block.state.BlockBehaviour;
68

79
import java.util.function.Supplier;
810

911
public class ChestT extends ChestBlock {
1012

11-
public ChestT(Settings settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> supplier) {
13+
public ChestT(BlockBehaviour.Properties settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> supplier) {
1214
super(settings, supplier);
1315
}
1416

15-
public Identifier getTexture() {
17+
public ResourceLocation getTexture() {
1618
return null;
1719
}
1820
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/HotBlockT.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22

33
import com.ryorama.terrariamod.TerrariaMod;
44
import com.ryorama.terrariamod.buffs.BuffsT;
5-
import net.minecraft.block.BlockState;
6-
import net.minecraft.enchantment.EnchantmentHelper;
7-
import net.minecraft.entity.Entity;
8-
import net.minecraft.entity.LivingEntity;
9-
import net.minecraft.util.math.BlockPos;
10-
import net.minecraft.world.World;
5+
import net.minecraft.core.BlockPos;
6+
import net.minecraft.world.entity.Entity;
7+
import net.minecraft.world.entity.LivingEntity;
8+
import net.minecraft.world.item.enchantment.EnchantmentHelper;
9+
import net.minecraft.world.level.Level;
10+
import net.minecraft.world.level.block.state.BlockBehaviour;
11+
import net.minecraft.world.level.block.state.BlockState;
1112

1213
public class HotBlockT extends BlockT {
13-
public HotBlockT(Settings properties, float hardness, float difficulty) {
14+
public HotBlockT(BlockBehaviour.Properties properties, float hardness, float difficulty) {
1415
super(properties, hardness, difficulty);
1516
}
1617

1718
@Override
18-
public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) {
19-
if (!entity.bypassesSteppingEffects() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
19+
public void stepOn(Level world, BlockPos pos, BlockState state, Entity entity) {
20+
if (!entity.isSteppingCarefully() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
2021
if (TerrariaMod.CONFIG.replaceSpecialDamageWithDebuffs) {
2122
BuffsT.AddBuffToEntity((LivingEntity) entity, 1, BuffsT.ON_FIRE);
2223
} else {
23-
entity.damage(world.getDamageSources().hotFloor(), 1);
24+
entity.hurt(world.damageSources().hotFloor(), 1);
2425
}
2526
}
2627

27-
super.onSteppedOn(world, pos, state, entity);
28+
super.stepOn(world, pos, state, entity);
2829
}
2930
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/PlantT.java

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
package com.ryorama.terrariamod.blocks.impl;
22

33
import com.ryorama.terrariamod.client.TAudio;
4-
import net.minecraft.block.AbstractBlock;
5-
import net.minecraft.block.Block;
6-
import net.minecraft.block.BlockState;
7-
import net.minecraft.block.ShapeContext;
8-
import net.minecraft.sound.BlockSoundGroup;
9-
import net.minecraft.util.math.BlockPos;
10-
import net.minecraft.util.shape.VoxelShape;
11-
import net.minecraft.util.shape.VoxelShapes;
12-
import net.minecraft.world.BlockView;
13-
import net.minecraft.world.World;
4+
import net.minecraft.core.BlockPos;
5+
import net.minecraft.world.level.BlockGetter;
6+
import net.minecraft.world.level.block.state.BlockBehaviour;
7+
import net.minecraft.world.level.block.state.BlockState;
8+
import net.minecraft.world.phys.shapes.CollisionContext;
9+
import net.minecraft.world.phys.shapes.Shapes;
10+
import net.minecraft.world.phys.shapes.VoxelShape;
1411

15-
import java.util.Random;
1612
import java.util.function.ToIntFunction;
1713

1814
public class PlantT extends BlockT {
19-
public PlantT(AbstractBlock.Settings properties, float hardness, float difficulty) {
20-
super(properties.nonOpaque().sounds(TAudio.GRASS_GRP).noCollision().notSolid(), hardness, difficulty);
15+
public PlantT(BlockBehaviour.Properties properties, float hardness, float difficulty) {
16+
super(properties.noOcclusion().sound(TAudio.GRASS_GRP).noCollision().notSolid(), hardness, difficulty);
2117
}
2218

23-
public PlantT(AbstractBlock.Settings properties, float hardness, float difficulty, int luminance) {
24-
super(properties.nonOpaque().sounds(TAudio.GRASS_GRP).noCollision().luminance(new ToIntFunction<BlockState>() {
19+
public PlantT(BlockBehaviour.Properties properties, float hardness, float difficulty, int luminance) {
20+
super(properties.noOcclusion().sound(TAudio.GRASS_GRP).noCollision().luminance(new ToIntFunction<BlockState>() {
2521
@Override
2622
public int applyAsInt(BlockState value) {
2723
return luminance;
2824
}
2925
}), hardness, difficulty);
3026
}
3127

32-
public boolean isFullCube(BlockView world, BlockPos pos) {
28+
public boolean isFullCube(BlockGetter world, BlockPos pos) {
3329
return false;
3430
}
3531

36-
public int getOpacity(BlockState state, BlockView world, BlockPos pos) {
32+
public int getOpacity(BlockState state, BlockGetter world, BlockPos pos) {
3733
return 0;
3834
}
3935

40-
public VoxelShape getOutlineShape(BlockView world, BlockPos pos, ShapeContext context) {
41-
return VoxelShapes.empty();
36+
public VoxelShape getOutlineShape(BlockGetter world, BlockPos pos, CollisionContext context) {
37+
return Shapes.empty();
4238
}
4339
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/TreeSegment.java

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
package com.ryorama.terrariamod.blocks.impl;
22

33
import com.ryorama.terrariamod.client.TAudio;
4-
import net.minecraft.block.AbstractBlock;
5-
import net.minecraft.block.BlockState;
6-
import net.minecraft.block.ShapeContext;
7-
import net.minecraft.util.math.BlockPos;
8-
import net.minecraft.util.shape.VoxelShape;
9-
import net.minecraft.util.shape.VoxelShapes;
10-
import net.minecraft.world.BlockView;
11-
12-
import java.util.Random;
4+
import net.minecraft.core.BlockPos;
5+
import net.minecraft.world.level.BlockGetter;
6+
import net.minecraft.world.level.block.state.BlockBehaviour;
7+
import net.minecraft.world.level.block.state.BlockState;
8+
import net.minecraft.world.phys.shapes.CollisionContext;
9+
import net.minecraft.world.phys.shapes.Shapes;
10+
import net.minecraft.world.phys.shapes.VoxelShape;
1311

1412
public class TreeSegment extends BlockT {
1513

16-
public TreeSegment(AbstractBlock.Settings properties, float hardness, float difficulty) {
17-
super(properties.nonOpaque().sounds(TAudio.DIRT).notSolid(), hardness, difficulty);
14+
public TreeSegment(BlockBehaviour.Properties properties, float hardness, float difficulty) {
15+
super(properties.noOcclusion().sound(TAudio.DIRT).notSolid(), hardness, difficulty);
1816
}
1917

20-
public boolean isFullCube(BlockView world, BlockPos pos) {
18+
public boolean isFullCube(BlockGetter world, BlockPos pos) {
2119
return false;
2220
}
2321

24-
public VoxelShape getOutlineShape(BlockView world, BlockPos pos, ShapeContext context) {
25-
return VoxelShapes.empty();
22+
public VoxelShape getOutlineShape(BlockGetter world, BlockPos pos, CollisionContext context) {
23+
return Shapes.empty();
2624
}
2725

28-
public boolean isTranslucent(BlockState state, BlockView world, BlockPos pos) {
26+
public boolean isTranslucent(BlockState state, BlockGetter world, BlockPos pos) {
2927
return true;
3028
}
3129
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/terraria/chests/FrozenChest.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,27 @@
44
import com.ryorama.terrariamod.blocks.impl.ChestT;
55
import com.ryorama.terrariamod.entities.EntitiesT;
66
import com.ryorama.terrariamod.entities.terraria.block.FrozenChestBlockEntity;
7-
import net.minecraft.block.BlockState;
8-
import net.minecraft.block.entity.BlockEntity;
9-
import net.minecraft.block.entity.BlockEntityType;
10-
import net.minecraft.block.entity.ChestBlockEntity;
11-
import net.minecraft.util.Identifier;
12-
import net.minecraft.util.math.BlockPos;
7+
import net.minecraft.core.BlockPos;
8+
import net.minecraft.resources.ResourceLocation;
9+
import net.minecraft.world.level.block.entity.BlockEntity;
10+
import net.minecraft.world.level.block.state.BlockBehaviour;
11+
import net.minecraft.world.level.block.state.BlockState;
1312

1413
import java.util.function.Supplier;
1514

1615
public class FrozenChest extends ChestT {
1716

18-
public FrozenChest(Settings settings) {
17+
public FrozenChest(BlockBehaviour.Properties settings) {
1918
super(settings, () -> EntitiesT.FROZEN_CHEST.get());
2019
}
2120

2221
@Override
23-
public Identifier getTexture() {
24-
return new Identifier(TerrariaMod.MOD_ID, "entity/chest/frozen_chest");
22+
public ResourceLocation getTexture() {
23+
return new ResourceLocation(TerrariaMod.MOD_ID, "entity/chest/frozen_chest");
2524
}
2625

2726
@Override
28-
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
27+
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
2928
return new FrozenChestBlockEntity(pos, state);
3029
}
3130
}

‎common/src/main/java/com/ryorama/terrariamod/blocks/terraria/chests/GoldChest.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,27 @@
44
import com.ryorama.terrariamod.blocks.impl.ChestT;
55
import com.ryorama.terrariamod.entities.EntitiesT;
66
import com.ryorama.terrariamod.entities.terraria.block.GoldChestBlockEntity;
7-
import net.minecraft.block.BlockState;
8-
import net.minecraft.block.entity.BlockEntity;
9-
import net.minecraft.block.entity.BlockEntityType;
10-
import net.minecraft.block.entity.ChestBlockEntity;
11-
import net.minecraft.util.Identifier;
12-
import net.minecraft.util.math.BlockPos;
7+
import net.minecraft.core.BlockPos;
8+
import net.minecraft.resources.ResourceLocation;
9+
import net.minecraft.world.level.block.entity.BlockEntity;
10+
import net.minecraft.world.level.block.state.BlockBehaviour;
11+
import net.minecraft.world.level.block.state.BlockState;
1312

1413
import java.util.function.Supplier;
1514

1615
public class GoldChest extends ChestT {
1716

18-
public GoldChest(Settings settings) {
17+
public GoldChest(BlockBehaviour.Properties settings) {
1918
super(settings, () -> EntitiesT.GOLD_CHEST.get());
2019
}
2120

2221
@Override
23-
public Identifier getTexture() {
24-
return new Identifier(TerrariaMod.MOD_ID, "entity/chest/gold_chest");
22+
public ResourceLocation getTexture() {
23+
return new ResourceLocation(TerrariaMod.MOD_ID, "entity/chest/gold_chest");
2524
}
2625

2726
@Override
28-
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
27+
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
2928
return new GoldChestBlockEntity(pos, state);
3029
}
3130
}

0 commit comments

Comments
 (0)