Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Update forge

Browse source
This commit is contained in:
Ellpeck 2016-12-05 17:10:23 +01:00
parent c377d54e52
commit 9b7177fbe9
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -23,7 +23,7 @@ if(hasProperty('buildnumber')){
} }
minecraft { minecraft {
version = "1.11-13.19.0.2160" version = "1.11-13.19.0.2180"
runDir = "idea" runDir = "idea"
mappings = "snapshot_20161126" mappings = "snapshot_20161126"
@ -45,7 +45,7 @@ repositories {
dependencies { dependencies {
compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51" compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51"
deobfCompile "mezz.jei:jei_1.11:4.0.4.198" deobfCompile "mezz.jei:jei_1.11:4.0.4.199"
} }
processResources { processResources {

16
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
View file

@ -19,6 +19,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.ItemStackHandler;
public abstract class TileEntityInventoryBase extends TileEntityBase{ public abstract class TileEntityInventoryBase extends TileEntityBase{
@ -108,20 +109,7 @@ public abstract class TileEntityInventoryBase extends TileEntityBase{
@Override @Override
public int getComparatorStrength(){ public int getComparatorStrength(){
int i = 0; return ItemHandlerHelper.calcRedstoneFromInventory(this.slots);
float f = 0;
for(int j = 0; j < this.slots.getSlots(); ++j){
ItemStack stack = this.slots.getStackInSlot(j);
if(StackUtil.isValid(stack)){
f += (float)StackUtil.getStackSize(stack)/(float)Math.min(this.getMaxStackSizePerSlot(j, stack), stack.getMaxStackSize());
i++;
}
}
f = f/(float)this.slots.getSlots();
return MathHelper.floor(f*14.0F)+(i > 0 ? 1 : 0);
} }
@Override @Override

12
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
View file

@ -20,7 +20,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import java.util.*; import java.util.*;
public class TileEntityItemViewer extends TileEntityBase{ public class TileEntityItemViewer extends TileEntityBase{
@ -89,6 +88,17 @@ public class TileEntityItemViewer extends TileEntityBase{
} }
return StackUtil.getNull(); return StackUtil.getNull();
} }
@Override
public int getSlotLimit(int slot){
SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot);
if(info != null){
return info.handler.getSlotLimit(info.switchedIndex);
}
else{
return 0;
}
}
}; };
} }