Skip to content

Commit 42153a9

Browse files
mineLdivercalmilamsy
mineLdiver
and
calmilamsy
authored
Update mappings (#223)
* Added StationFlatteningBlock#onStateReplaced * Update loom * Remap stage 1 * Stash * Stash * Most of the way there * Can load into a world now and start the server * Should be fully functional now * Fixed rebasing issues * Imagine not catching only whole words when remapping, *cal* * Part 2 of that --------- Co-authored-by: calmilamsy <bumbill00@gmail.com>
1 parent 476abed commit 42153a9

313 files changed

Lines changed: 1678 additions & 1683 deletions

File tree

Some content is hidden

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

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fabric.loom.multiProjectOptimisation=true
1010
# Fabric Properties
1111
# check these on https://fabricmc.net/use
1212
minecraft_version = b1.7.3
13-
yarn_mappings = b1.7.3+cbcfb39
13+
yarn_mappings = b1.7.3+e1fe071
1414
loader_version = 0.16.9
1515

1616
# Library Properties

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/test/java/net/modificationstation/sltest/block/BlockAltar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.modificationstation.sltest.block;
22

3-
import net.minecraft.block.Material;
3+
import net.minecraft.block.material.Material;
44
import net.modificationstation.sltest.texture.TextureListener;
55
import net.modificationstation.stationapi.api.util.Identifier;
66
import net.modificationstation.stationapi.api.template.block.TemplateBlock;

‎src/test/java/net/modificationstation/sltest/block/BlockFreezer.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package net.modificationstation.sltest.block;
77

88
import net.minecraft.block.Block;
9-
import net.minecraft.block.Material;
109
import net.minecraft.block.entity.BlockEntity;
10+
import net.minecraft.block.material.Material;
1111
import net.minecraft.entity.ItemEntity;
1212
import net.minecraft.entity.LivingEntity;
1313
import net.minecraft.entity.player.PlayerEntity;
@@ -36,7 +36,7 @@ public class BlockFreezer extends TemplateBlockWithEntity
3636

3737
protected BlockFreezer(Identifier blockID)
3838
{
39-
super(blockID, Material.field_998);
39+
super(blockID, Material.SNOW_LAYER);
4040
FrozenRand = new Random();
4141
}
4242

@@ -74,14 +74,14 @@ private void setDefaultDirection(World world, int i, int j, int k)
7474
{
7575
byte0 = 4;
7676
}
77-
world.method_215(i, j, k, byte0);
77+
world.setBlockMeta(i, j, k, byte0);
7878
}
7979

8080
@Override
8181
public void randomDisplayTick(World world, int i, int j, int k, Random random)
8282
{
83-
TileEntityFreezer tileentity = (TileEntityFreezer)world.method_1777(i, j, k);
84-
if(world.isRemote ? tileentity.method_1069() == 1 : tileentity.isBurning())
83+
TileEntityFreezer tileentity = (TileEntityFreezer)world.getBlockEntity(i, j, k);
84+
if(world.isRemote ? tileentity.getPushedBlockData() == 1 : tileentity.isBurning())
8585
{
8686
float f = (float)i + 0.5F;
8787
float f1 = (float)j + 1.0F + (random.nextFloat() * 6F) / 16F;
@@ -112,7 +112,7 @@ public int getTexture(int i)
112112
@Override
113113
public boolean onUse(World world, int i, int j, int k, PlayerEntity entityplayer)
114114
{
115-
BlockEntity tileentityFreezer = world.method_1777(i, j, k);
115+
BlockEntity tileentityFreezer = world.getBlockEntity(i, j, k);
116116
if (tileentityFreezer instanceof TileEntityFreezer freezer)
117117
GuiHelper.openGUI(entityplayer, of(NAMESPACE, "freezer"), freezer, new ContainerFreezer(entityplayer.inventory, freezer));
118118
return true;
@@ -121,9 +121,9 @@ public boolean onUse(World world, int i, int j, int k, PlayerEntity entityplayer
121121
public static void updateFreezerBlockState(boolean flag, World world, int i, int j, int k)
122122
{
123123
int l = world.getBlockMeta(i, j, k);
124-
BlockEntity tileentity = world.method_1777(i, j, k);
124+
BlockEntity tileentity = world.getBlockEntity(i, j, k);
125125
world.setBlock(i, j, k, l);
126-
world.method_157(i, j, k, tileentity);
126+
world.setBlockEntity(i, j, k, tileentity);
127127
}
128128

129129
@Override
@@ -138,26 +138,26 @@ public void onPlaced(World world, int i, int j, int k, LivingEntity entityliving
138138
int l = MathHelper.floor((double)((entityliving.yaw * 4F) / 360F) + 0.5D) & 3;
139139
if(l == 0)
140140
{
141-
world.method_215(i, j, k, 2);
141+
world.setBlockMeta(i, j, k, 2);
142142
}
143143
if(l == 1)
144144
{
145-
world.method_215(i, j, k, 5);
145+
world.setBlockMeta(i, j, k, 5);
146146
}
147147
if(l == 2)
148148
{
149-
world.method_215(i, j, k, 3);
149+
world.setBlockMeta(i, j, k, 3);
150150
}
151151
if(l == 3)
152152
{
153-
world.method_215(i, j, k, 4);
153+
world.setBlockMeta(i, j, k, 4);
154154
}
155155
}
156156

157157
@Override
158158
public void onBreak(World world, int i, int j, int k)
159159
{
160-
TileEntityFreezer tileentityFreezer = (TileEntityFreezer)world.method_1777(i, j, k);
160+
TileEntityFreezer tileentityFreezer = (TileEntityFreezer)world.getBlockEntity(i, j, k);
161161
label0:
162162
for(int l = 0; l < tileentityFreezer.size(); l++)
163163
{
@@ -186,7 +186,7 @@ public void onBreak(World world, int i, int j, int k)
186186
entityitem.velocityX = (float)FrozenRand.nextGaussian() * f3;
187187
entityitem.velocityY = (float)FrozenRand.nextGaussian() * f3 + 0.2F;
188188
entityitem.velocityZ = (float)FrozenRand.nextGaussian() * f3;
189-
world.method_210(entityitem);
189+
world.spawnEntity(entityitem);
190190
} while(true);
191191
}
192192

‎src/test/java/net/modificationstation/sltest/block/Blocks.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.mine_diver.unsafeevents.listener.EventListener;
44
import net.minecraft.block.Block;
5-
import net.minecraft.block.Material;
5+
import net.minecraft.block.material.Material;
66
import net.modificationstation.sltest.mixin.BlockBaseAccessor;
77
import net.modificationstation.stationapi.api.event.registry.BlockRegistryEvent;
88
import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;

‎src/test/java/net/modificationstation/sltest/block/ColouredBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.modificationstation.sltest.block;
22

33
import net.minecraft.block.Block;
4-
import net.minecraft.block.Material;
4+
import net.minecraft.block.material.Material;
55
import net.minecraft.world.BlockView;
66

77
public class ColouredBlock extends Block {

‎src/test/java/net/modificationstation/sltest/block/EffectBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.modificationstation.sltest.block;
22

3-
import net.minecraft.block.Material;
3+
import net.minecraft.block.material.Material;
44
import net.minecraft.entity.player.PlayerEntity;
55
import net.minecraft.world.BlockView;
66
import net.minecraft.world.World;

‎src/test/java/net/modificationstation/sltest/block/EffectBlockClear.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package net.modificationstation.sltest.block;
22

3-
import net.minecraft.block.Material;
3+
import net.minecraft.block.material.Material;
44
import net.minecraft.entity.player.PlayerEntity;
55
import net.minecraft.world.BlockView;
66
import net.minecraft.world.World;
7-
import net.modificationstation.sltest.SLTest;
87
import net.modificationstation.stationapi.api.template.block.TemplateBlock;
98
import net.modificationstation.stationapi.api.util.Identifier;
109

‎src/test/java/net/modificationstation/sltest/block/EffectBlockInf.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.modificationstation.sltest.block;
22

3-
import net.minecraft.block.Material;
3+
import net.minecraft.block.material.Material;
44
import net.minecraft.entity.player.PlayerEntity;
55
import net.minecraft.world.BlockView;
66
import net.minecraft.world.World;

‎src/test/java/net/modificationstation/sltest/block/IndispensableBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.modificationstation.sltest.block;
22

3-
import net.minecraft.block.Material;
3+
import net.minecraft.block.material.Material;
44
import net.modificationstation.sltest.item.IndispensableBlockItem;
55
import net.modificationstation.stationapi.api.block.HasCustomBlockItemFactory;
66
import net.modificationstation.stationapi.api.template.block.TemplateBlock;

0 commit comments

Comments
 (0)