mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-14 12:07:10 +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

2
src/test/java/dan200/computercraft/core/filesystem/ResourceMountTest.java
View File

@@ -29,7 +29,7 @@ public class ResourceMountTest
public void before()
{
SimpleReloadableResourceManager manager = new SimpleReloadableResourceManager( ResourcePackType.SERVER_DATA, null );
manager.addResourcePack( new FolderPack( new File( "src/main/resources" ) ) );
manager.add( new FolderPack( new File( "src/main/resources" ) ) );
mount = ResourceMount.get( "computercraft", "lua/rom", manager );
}

2
src/test/java/dan200/computercraft/shared/wired/NetworkTest.java
View File

@@ -259,7 +259,7 @@ public class NetworkTest
grid.forEach( ( existing, pos ) -> {
for( Direction facing : DirectionUtil.FACINGS )
{
BlockPos offset = pos.offset( facing );
BlockPos offset = pos.relative( facing );
if( offset.getX() > BRUTE_SIZE / 2 == pos.getX() > BRUTE_SIZE / 2 )
{
IWiredNode other = grid.get( offset );