mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-09 01:42:59 +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/common/ColourableRecipe.java
View File

@@ -30,9 +30,9 @@ public final class ColourableRecipe extends SpecialRecipe
{
boolean hasColourable = false;
boolean hasDye = false;
for( int i = 0; i < inv.getSizeInventory(); i++ )
for( int i = 0; i < inv.getContainerSize(); i++ )
{
ItemStack stack = inv.getStackInSlot( i );
ItemStack stack = inv.getItem( i );
if( stack.isEmpty() ) continue;
if( stack.getItem() instanceof IColouredItem )
@@ -55,15 +55,15 @@ public final class ColourableRecipe extends SpecialRecipe
@Nonnull
@Override
public ItemStack getCraftingResult( @Nonnull CraftingInventory inv )
public ItemStack assemble( @Nonnull CraftingInventory inv )
{
ItemStack colourable = ItemStack.EMPTY;
ColourTracker tracker = new ColourTracker();
for( int i = 0; i < inv.getSizeInventory(); i++ )
for( int i = 0; i < inv.getContainerSize(); i++ )
{
ItemStack stack = inv.getStackInSlot( i );
ItemStack stack = inv.getItem( i );
if( stack.isEmpty() ) continue;
@@ -83,7 +83,7 @@ public final class ColourableRecipe extends SpecialRecipe
}
@Override
public boolean canFit( int x, int y )
public boolean canCraftInDimensions( int x, int y )
{
return x >= 2 && y >= 2;
}