mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Use tags to check if something is a dye 

We half did this already, just needed to change a couple of checks.
Closes #541.
This commit is contained in:
SquidDev 2020-09-16 21:27:59 +01:00
parent 275ca58a82
commit 6f868849ab
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java
View File

@ -13,7 +13,6 @@
import net.minecraft.inventory.Inventory; import net.minecraft.inventory.Inventory;
import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Container;
import net.minecraft.inventory.container.Slot; import net.minecraft.inventory.container.Slot;
import net.minecraft.item.DyeItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IIntArray; import net.minecraft.util.IIntArray;
import net.minecraft.util.IntArray; import net.minecraft.util.IntArray;
@ -95,7 +94,7 @@ public ItemStack transferStackInSlot( @Nonnull PlayerEntity player, int index )
else else
{ {
// Transfer from inventory to printer // Transfer from inventory to printer
if( stack.getItem() instanceof DyeItem ) if( TilePrinter.isInk( stack ) )
{ {
if( !mergeItemStack( stack, 0, 1, false ) ) return ItemStack.EMPTY; if( !mergeItemStack( stack, 0, 1, false ) ) return ItemStack.EMPTY;
} }

10
src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
View File

@ -300,9 +300,9 @@ void setPageTitle( String title )
} }
} }
private static boolean isInk( @Nonnull ItemStack stack ) static boolean isInk( @Nonnull ItemStack stack )
{ {
return stack.getItem() instanceof DyeItem; return ColourUtils.getStackColour( stack ) != null;
} }
private static boolean isPaper( @Nonnull ItemStack stack ) private static boolean isPaper( @Nonnull ItemStack stack )
@ -321,7 +321,8 @@ private boolean canInputPage()
private boolean inputPage() private boolean inputPage()
{ {
ItemStack inkStack = m_inventory.get( 0 ); ItemStack inkStack = m_inventory.get( 0 );
if( !isInk( inkStack ) ) return false; DyeColor dye = ColourUtils.getStackColour( inkStack );
if( dye == null ) return false;
for( int i = 1; i < 7; i++ ) for( int i = 1; i < 7; i++ )
{ {
@ -329,8 +330,7 @@ private boolean inputPage()
if( paperStack.isEmpty() || !isPaper( paperStack ) ) continue; if( paperStack.isEmpty() || !isPaper( paperStack ) ) continue;
// Setup the new page // Setup the new page
DyeColor dye = ColourUtils.getStackColour( inkStack ); m_page.setTextColour( dye.getId() );
m_page.setTextColour( dye != null ? dye.getId() : 15 );
m_page.clear(); m_page.clear();
if( paperStack.getItem() instanceof ItemPrintout ) if( paperStack.getItem() instanceof ItemPrintout )

2
src/main/java/dan200/computercraft/shared/util/ColourUtils.java
View File

@ -40,6 +40,8 @@ private ColourUtils() {}
public static DyeColor getStackColour( ItemStack stack ) public static DyeColor getStackColour( ItemStack stack )
{ {
if( stack.isEmpty() ) return null;
for( int i = 0; i < DYES.length; i++ ) for( int i = 0; i < DYES.length; i++ )
{ {
Tag<Item> dye = DYES[i]; Tag<Item> dye = DYES[i];