-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/niard'
- Loading branch information
Showing
20 changed files
with
1,120 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
src/main/java/info/loenwind/enderioaddons/fluid/FluidType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package info.loenwind.enderioaddons.fluid; | ||
|
||
public enum FluidType { | ||
VANILLA, | ||
CLASSIC, | ||
FINITE | ||
} |
17 changes: 17 additions & 0 deletions
17
src/main/java/info/loenwind/enderioaddons/gui/StdSlot.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package info.loenwind.enderioaddons.gui; | ||
|
||
import net.minecraft.inventory.IInventory; | ||
import net.minecraft.inventory.Slot; | ||
import net.minecraft.item.ItemStack; | ||
|
||
public final class StdSlot extends Slot { | ||
|
||
public StdSlot(IInventory inventory, int slotIndex, int x, int y) { | ||
super(inventory, slotIndex, x, y); | ||
} | ||
|
||
@Override | ||
public boolean isItemValid(ItemStack itemStack) { | ||
return inventory.isItemValidForSlot(getSlotIndex(), itemStack); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/main/java/info/loenwind/enderioaddons/machine/niard/BlockItemNiard.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package info.loenwind.enderioaddons.machine.niard; | ||
|
||
import java.util.List; | ||
|
||
import net.minecraft.block.Block; | ||
import net.minecraft.entity.player.EntityPlayer; | ||
import net.minecraft.item.ItemBlockWithMetadata; | ||
import net.minecraft.item.ItemStack; | ||
|
||
import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; | ||
|
||
import crazypants.enderio.EnderIOTab; | ||
|
||
public class BlockItemNiard extends ItemBlockWithMetadata implements IAdvancedTooltipProvider { | ||
|
||
public BlockItemNiard() { | ||
this(BlockNiard.blockNiard); | ||
} | ||
|
||
public BlockItemNiard(Block block) { | ||
super(block, block); | ||
setHasSubtypes(false); | ||
setCreativeTab(EnderIOTab.tabEnderIO); | ||
} | ||
|
||
@Override | ||
public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { | ||
BlockNiard.blockNiard.addCommonEntries(itemstack, entityplayer, list, flag); | ||
} | ||
|
||
@Override | ||
public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { | ||
BlockNiard.blockNiard.addBasicEntries(itemstack, entityplayer, list, flag); | ||
} | ||
|
||
@Override | ||
public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { | ||
BlockNiard.blockNiard.addDetailedEntries(itemstack, entityplayer, list, flag); | ||
} | ||
|
||
} |
Oops, something went wrong.