Merge branch '1.12' into feature/solar-panles

Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
	src/main/java/techreborn/blocks/lighting/BlockLamp.java
This commit is contained in:
drcrazy 2017-11-28 17:28:47 +03:00
commit eab088c094
77 changed files with 948 additions and 967 deletions

View file

@ -61,6 +61,7 @@ public class RegisterItemJsons {
register(ModItems.MANUAL, "misc/manual");
register(ModItems.DEBUG, "misc/debug");
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
register(ModItems.MISSING_RECIPE_PLACEHOLDER, "misc/missing_recipe");
register(ModItems.STEEL_DRILL, "tool/steel_drill");
register(ModItems.DIAMOND_DRILL, "tool/diamond_drill");

View file

@ -44,6 +44,8 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.Core;
import techreborn.client.container.builder.slot.FilteredSlot;
import techreborn.client.container.builder.slot.UpgradeSlot;
import techreborn.compat.CompatManager;
import techreborn.utils.IC2ItemCharger;
import java.util.function.Consumer;
import java.util.function.IntConsumer;
@ -89,7 +91,7 @@ public class ContainerTileInventoryBuilder {
public ContainerTileInventoryBuilder energySlot(final int index, final int x, final int y) {
this.parent.slots.add(new FilteredSlot(this.tile, index, x, y)
.setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP)
|| stack.getItem() instanceof IEnergyInterfaceItem));
|| stack.getItem() instanceof IEnergyInterfaceItem || (CompatManager.isIC2Loaded && IC2ItemCharger.isIC2PoweredItem(stack))));
return this;
}
@ -124,6 +126,7 @@ public class ContainerTileInventoryBuilder {
* @param supplier The supplier must supply a variable holding inside a Short, it
* will be truncated by force.
* @param setter The setter to call when the variable has been updated.
* @return ContainerTileInventoryBuilder Inventory which will do the sync
*/
public ContainerTileInventoryBuilder syncShortValue(final IntSupplier supplier, final IntConsumer setter) {
this.parent.shortValues.add(Pair.of(supplier, setter));
@ -134,6 +137,7 @@ public class ContainerTileInventoryBuilder {
* @param supplier The supplier it can supply a variable holding in an Integer it
* will be split inside multiples shorts.
* @param setter The setter to call when the variable has been updated.
* @return ContainerTileInventoryBuilder Inventory which will do the sync
*/
public ContainerTileInventoryBuilder syncIntegerValue(final IntSupplier supplier, final IntConsumer setter) {
this.parent.integerValues.add(Pair.of(supplier, setter));

View file

@ -353,6 +353,7 @@ public class TRBuilder extends GuiBuilder {
}
}
@Override
public void drawSlot(GuiScreen gui, int posX, int posY) {
Minecraft.getMinecraft().getTextureManager().bindTexture(GUI_SHEET);
gui.drawTexturedModalRect(posX, posY, 150, 0, 18, 18);
@ -387,6 +388,7 @@ public class TRBuilder extends GuiBuilder {
}
}
@Override
public void drawOutputSlot(GuiScreen gui, int posX, int posY) {
Minecraft.getMinecraft().getTextureManager().bindTexture(GUI_SHEET);
gui.drawTexturedModalRect(posX, posY, 150, 18, 26, 26);

View file

@ -232,6 +232,7 @@ public class GuiAutoCrafting extends GuiBase {
this.recipeSlector.slotClicked(slotIn);
}
@Override
public void onGuiClosed() {
this.recipeSlector.removed();
super.onGuiClosed();