mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-12 03:13:00 +00:00
Code Issues Releases Wiki Activity

Switch to Mojang mappings

Browse Source 
ForgeGradle (probably sensibly) yells at me about doing this. However:
 - There's a reasonable number of mods doing this, which establishes
   some optimistic precedent.
 - The licence update in Aug 2020 now allows you to use them for
   "development purposes". I guess source code counts??
 - I'm fairly sure this is also compatible with the CCPL - there's an
   exception for Minecraft code.

The main motivation for this is to make the Fabric port a little
easier. Hopefully folks (maybe me in the future, we'll see) will no
longer have to deal with mapping hell when merging - only mod loader
hell.
This commit is contained in:
Jonathan Coates
2021-01-09 19:22:58 +00:00
parent c864576619
commit 34b5ede326
178 changed files with 1789 additions and 1738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/dan200/computercraft/shared/util/TickScheduler.java
View File

@@ -40,8 +40,8 @@ public final class TickScheduler
public static void schedule( TileGeneric tile )
{
World world = tile.getWorld();
if( world != null && !world.isRemote ) toTick.add( tile );
World world = tile.getLevel();
if( world != null && !world.isClientSide ) toTick.add( tile );
}
@SubscribeEvent
@@ -55,12 +55,12 @@ public final class TickScheduler
TileEntity tile = iterator.next();
iterator.remove();
World world = tile.getWorld();
BlockPos pos = tile.getPos();
World world = tile.getLevel();
BlockPos pos = tile.getBlockPos();
if( world != null && pos != null && world.isAreaLoaded( pos, 0 ) && world.getTileEntity( pos ) == tile )
if( world != null && pos != null && world.isAreaLoaded( pos, 0 ) && world.getBlockEntity( pos ) == tile )
{
world.getPendingBlockTicks().scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
world.getBlockTicks().scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
}
}
}