Logistics Part II
- Added Screens for Flexcrate and Stockswitch - Added Models for Flexcrate and Stockswitch - Added Container and Inventory to Flexcrate - Redstone bridges are now divided into senders and receivers - Fixed some GUI inconsistencies and repetitive code
|
@ -20,7 +20,7 @@ archivesBaseName = 'create'
|
||||||
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
|
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'snapshot', version: '20190816-1.14.3'
|
mappings channel: 'snapshot', version: '20190825-1.14.3'
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
|
@ -58,7 +58,7 @@ minecraft {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft 'net.minecraftforge:forge:1.14.4-28.0.49'
|
minecraft 'net.minecraftforge:forge:1.14.4-28.0.55'
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|
|
@ -25,9 +25,9 @@ import com.simibubi.create.modules.contraptions.relays.EncasedBeltBlock;
|
||||||
import com.simibubi.create.modules.contraptions.relays.GearboxBlock;
|
import com.simibubi.create.modules.contraptions.relays.GearboxBlock;
|
||||||
import com.simibubi.create.modules.contraptions.relays.GearshifterBlock;
|
import com.simibubi.create.modules.contraptions.relays.GearshifterBlock;
|
||||||
import com.simibubi.create.modules.gardens.CocoaLogBlock;
|
import com.simibubi.create.modules.gardens.CocoaLogBlock;
|
||||||
import com.simibubi.create.modules.logistics.FlexCrateBlock;
|
import com.simibubi.create.modules.logistics.FlexcrateBlock;
|
||||||
import com.simibubi.create.modules.logistics.RedstoneBridgeBlock;
|
import com.simibubi.create.modules.logistics.RedstoneBridgeBlock;
|
||||||
import com.simibubi.create.modules.logistics.StockpileSwitchBlock;
|
import com.simibubi.create.modules.logistics.StockswitchBlock;
|
||||||
import com.simibubi.create.modules.schematics.block.CreativeCrateBlock;
|
import com.simibubi.create.modules.schematics.block.CreativeCrateBlock;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicTableBlock;
|
import com.simibubi.create.modules.schematics.block.SchematicTableBlock;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicannonBlock;
|
import com.simibubi.create.modules.schematics.block.SchematicannonBlock;
|
||||||
|
@ -91,8 +91,8 @@ public enum AllBlocks {
|
||||||
|
|
||||||
// Logistics
|
// Logistics
|
||||||
REDSTONE_BRIDGE(new RedstoneBridgeBlock()),
|
REDSTONE_BRIDGE(new RedstoneBridgeBlock()),
|
||||||
STOCKPILE_SWITCH(new StockpileSwitchBlock()),
|
STOCKSWITCH(new StockswitchBlock()),
|
||||||
FLEX_CRATE(new FlexCrateBlock()),
|
FLEXCRATE(new FlexcrateBlock()),
|
||||||
|
|
||||||
// Symmetry
|
// Symmetry
|
||||||
SYMMETRY_PLANE(new PlaneSymmetryBlock()),
|
SYMMETRY_PLANE(new PlaneSymmetryBlock()),
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package com.simibubi.create;
|
package com.simibubi.create;
|
||||||
|
|
||||||
import com.simibubi.create.modules.logistics.FlexCrateContainer;
|
import com.simibubi.create.modules.logistics.FlexcrateContainer;
|
||||||
import com.simibubi.create.modules.logistics.FlexCrateScreen;
|
import com.simibubi.create.modules.logistics.FlexcrateScreen;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicTableContainer;
|
import com.simibubi.create.modules.schematics.block.SchematicTableContainer;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicTableScreen;
|
import com.simibubi.create.modules.schematics.block.SchematicTableScreen;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicannonContainer;
|
import com.simibubi.create.modules.schematics.block.SchematicannonContainer;
|
||||||
|
@ -28,7 +28,7 @@ public enum AllContainers {
|
||||||
|
|
||||||
SchematicTable(SchematicTableContainer::new),
|
SchematicTable(SchematicTableContainer::new),
|
||||||
Schematicannon(SchematicannonContainer::new),
|
Schematicannon(SchematicannonContainer::new),
|
||||||
FlexCrate(FlexCrateContainer::new),
|
FlexCrate(FlexcrateContainer::new),
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ public enum AllContainers {
|
||||||
public static void registerScreenFactories() {
|
public static void registerScreenFactories() {
|
||||||
bind(SchematicTable, SchematicTableScreen::new);
|
bind(SchematicTable, SchematicTableScreen::new);
|
||||||
bind(Schematicannon, SchematicannonScreen::new);
|
bind(Schematicannon, SchematicannonScreen::new);
|
||||||
bind(FlexCrate, FlexCrateScreen::new);
|
bind(FlexCrate, FlexcrateScreen::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|
|
@ -21,9 +21,10 @@ import com.simibubi.create.modules.contraptions.relays.GearboxTileEntity;
|
||||||
import com.simibubi.create.modules.contraptions.relays.GearboxTileEntityRenderer;
|
import com.simibubi.create.modules.contraptions.relays.GearboxTileEntityRenderer;
|
||||||
import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntity;
|
import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntity;
|
||||||
import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntityRenderer;
|
import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntityRenderer;
|
||||||
import com.simibubi.create.modules.logistics.FlexCrateTileEntity;
|
import com.simibubi.create.modules.logistics.FlexcrateTileEntity;
|
||||||
import com.simibubi.create.modules.logistics.RedstoneBridgeTileEntity;
|
import com.simibubi.create.modules.logistics.RedstoneBridgeTileEntity;
|
||||||
import com.simibubi.create.modules.logistics.StockpileSwitchTileEntity;
|
import com.simibubi.create.modules.logistics.RedstoneBridgeTileEntityRenderer;
|
||||||
|
import com.simibubi.create.modules.logistics.StockswitchTileEntity;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity;
|
import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicannonRenderer;
|
import com.simibubi.create.modules.schematics.block.SchematicannonRenderer;
|
||||||
import com.simibubi.create.modules.schematics.block.SchematicannonTileEntity;
|
import com.simibubi.create.modules.schematics.block.SchematicannonTileEntity;
|
||||||
|
@ -62,8 +63,8 @@ public enum AllTileEntities {
|
||||||
|
|
||||||
// Logistics
|
// Logistics
|
||||||
REDSTONE_BRIDGE(RedstoneBridgeTileEntity::new, AllBlocks.REDSTONE_BRIDGE),
|
REDSTONE_BRIDGE(RedstoneBridgeTileEntity::new, AllBlocks.REDSTONE_BRIDGE),
|
||||||
STOCKPILE_SWITCH(StockpileSwitchTileEntity::new, AllBlocks.STOCKPILE_SWITCH),
|
STOCKSWITCH(StockswitchTileEntity::new, AllBlocks.STOCKSWITCH),
|
||||||
FLEX_CRATE(FlexCrateTileEntity::new, AllBlocks.FLEX_CRATE),
|
FLEXCRATE(FlexcrateTileEntity::new, AllBlocks.FLEXCRATE),
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -105,6 +106,7 @@ public enum AllTileEntities {
|
||||||
bind(DrillTileEntity.class, new KineticTileEntityRenderer());
|
bind(DrillTileEntity.class, new KineticTileEntityRenderer());
|
||||||
bind(CrushingWheelTileEntity.class, new KineticTileEntityRenderer());
|
bind(CrushingWheelTileEntity.class, new KineticTileEntityRenderer());
|
||||||
bind(WaterWheelTileEntity.class, new KineticTileEntityRenderer());
|
bind(WaterWheelTileEntity.class, new KineticTileEntityRenderer());
|
||||||
|
bind(RedstoneBridgeTileEntity.class, new RedstoneBridgeTileEntityRenderer());
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|
|
@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
public abstract class AbstractSimiScreen extends Screen {
|
public abstract class AbstractSimiScreen extends Screen {
|
||||||
|
|
||||||
protected int sWidth, sHeight;
|
protected int sWidth, sHeight;
|
||||||
protected int topLeftX, topLeftY;
|
protected int guiLeft, guiTop;
|
||||||
protected List<Widget> widgets;
|
protected List<Widget> widgets;
|
||||||
|
|
||||||
protected AbstractSimiScreen() {
|
protected AbstractSimiScreen() {
|
||||||
|
@ -26,8 +26,8 @@ public abstract class AbstractSimiScreen extends Screen {
|
||||||
protected void setWindowSize(int width, int height) {
|
protected void setWindowSize(int width, int height) {
|
||||||
sWidth = width;
|
sWidth = width;
|
||||||
sHeight = height;
|
sHeight = height;
|
||||||
topLeftX = (this.width - sWidth) / 2;
|
guiLeft = (this.width - sWidth) / 2;
|
||||||
topLeftY = (this.height - sHeight) / 2;
|
guiTop = (this.height - sHeight) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
package com.simibubi.create.foundation.gui;
|
||||||
|
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public class ScreenElementRenderer {
|
||||||
|
|
||||||
|
public static void render3DItem(Supplier<ItemStack> transformsAndStack) {
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
|
|
||||||
|
GlStateManager.enableBlend();
|
||||||
|
GlStateManager.enableRescaleNormal();
|
||||||
|
GlStateManager.enableAlphaTest();
|
||||||
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
|
ItemStack stack = transformsAndStack.get();
|
||||||
|
|
||||||
|
Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(stack, 0, 0);
|
||||||
|
GlStateManager.popMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderBlock(Supplier<BlockState> transformsAndState) {
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
|
|
||||||
|
GlStateManager.enableBlend();
|
||||||
|
GlStateManager.enableRescaleNormal();
|
||||||
|
GlStateManager.enableAlphaTest();
|
||||||
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
GlStateManager.alphaFunc(516, 0.1F);
|
||||||
|
GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
|
||||||
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
GlStateManager.translated(0, 0, 200);
|
||||||
|
|
||||||
|
BlockState toRender = transformsAndState.get();
|
||||||
|
|
||||||
|
GlStateManager.scaled(50, -50, 50);
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||||
|
mc.getBlockRendererDispatcher().renderBlockBrightness(toRender, 1);
|
||||||
|
|
||||||
|
GlStateManager.disableAlphaTest();
|
||||||
|
GlStateManager.disableRescaleNormal();
|
||||||
|
|
||||||
|
GlStateManager.popMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -23,6 +23,17 @@ public enum ScreenResources {
|
||||||
SCHEMATICANNON_HIGHLIGHT("schematicannon.png", 0, 182, 28, 28),
|
SCHEMATICANNON_HIGHLIGHT("schematicannon.png", 0, 182, 28, 28),
|
||||||
SCHEMATICANNON_FUEL("schematicannon.png", 0, 215, 82, 4),
|
SCHEMATICANNON_FUEL("schematicannon.png", 0, 215, 82, 4),
|
||||||
|
|
||||||
|
FLEXCRATE("flex_crate_and_stockpile_switch.png", 125, 129),
|
||||||
|
FLEXCRATE_LOCKED_SLOT("flex_crate_and_stockpile_switch.png", 138, 0, 18, 18),
|
||||||
|
|
||||||
|
STOCKSWITCH("flex_crate_and_stockpile_switch.png", 0, 129, 205, 93),
|
||||||
|
STOCKSWITCH_INTERVAL("flex_crate_and_stockpile_switch.png", 0, 222, 198, 17),
|
||||||
|
STOCKSWITCH_INTERVAL_END("flex_crate_and_stockpile_switch.png", 0, 239, 198, 17),
|
||||||
|
STOCKSWITCH_CURSOR_ON("flex_crate_and_stockpile_switch.png", 218, 129, 8, 21),
|
||||||
|
STOCKSWITCH_CURSOR_OFF("flex_crate_and_stockpile_switch.png", 226, 129, 8, 21),
|
||||||
|
STOCKSWITCH_BOUND_LEFT("flex_crate_and_stockpile_switch.png", 234, 129, 7, 21),
|
||||||
|
STOCKSWITCH_BOUND_RIGHT("flex_crate_and_stockpile_switch.png", 241, 129, 7, 21),
|
||||||
|
|
||||||
// Widgets
|
// Widgets
|
||||||
PALETTE_BUTTON("palette_picker.png", 0, 236, 20, 20),
|
PALETTE_BUTTON("palette_picker.png", 0, 236, 20, 20),
|
||||||
TEXT_INPUT("widgets.png", 0, 28, 194, 47),
|
TEXT_INPUT("widgets.png", 0, 28, 194, 47),
|
||||||
|
@ -74,7 +85,9 @@ public enum ScreenResources {
|
||||||
ICON_PATTERN_CHANCE_50("icons.png", 0, 112, 16, 16),
|
ICON_PATTERN_CHANCE_50("icons.png", 0, 112, 16, 16),
|
||||||
ICON_PATTERN_CHANCE_75("icons.png", 16, 112, 16, 16),
|
ICON_PATTERN_CHANCE_75("icons.png", 16, 112, 16, 16),
|
||||||
ICON_FOLLOW_DIAGONAL("icons.png", 32, 112, 16, 16),
|
ICON_FOLLOW_DIAGONAL("icons.png", 32, 112, 16, 16),
|
||||||
ICON_FOLLOW_MATERIAL("icons.png", 48, 112, 16, 16);
|
ICON_FOLLOW_MATERIAL("icons.png", 48, 112, 16, 16),
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
public static final int FONT_COLOR = 0x575F7A;
|
public static final int FONT_COLOR = 0x575F7A;
|
||||||
|
|
||||||
|
@ -92,8 +105,12 @@ public enum ScreenResources {
|
||||||
this.startX = startX; this.startY = startY;
|
this.startX = startX; this.startY = startY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(AbstractGui screen, int i, int j) {
|
public void bind() {
|
||||||
Minecraft.getInstance().getTextureManager().bindTexture(location);
|
Minecraft.getInstance().getTextureManager().bindTexture(location);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void draw(AbstractGui screen, int i, int j) {
|
||||||
|
bind();
|
||||||
screen.blit(i, j, startX, startY, width, height);
|
screen.blit(i, j, startX, startY, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,20 +37,20 @@ public class TextInputPromptScreen extends AbstractSimiScreen {
|
||||||
super.init();
|
super.init();
|
||||||
setWindowSize(ScreenResources.TEXT_INPUT.width, ScreenResources.TEXT_INPUT.height + 30);
|
setWindowSize(ScreenResources.TEXT_INPUT.width, ScreenResources.TEXT_INPUT.height + 30);
|
||||||
|
|
||||||
this.nameField = new TextFieldWidget(font, topLeftX + 33, topLeftY + 26, 128, 8, "");
|
this.nameField = new TextFieldWidget(font, guiLeft + 33, guiTop + 26, 128, 8, "");
|
||||||
this.nameField.setTextColor(-1);
|
this.nameField.setTextColor(-1);
|
||||||
this.nameField.setDisabledTextColour(-1);
|
this.nameField.setDisabledTextColour(-1);
|
||||||
this.nameField.setEnableBackgroundDrawing(false);
|
this.nameField.setEnableBackgroundDrawing(false);
|
||||||
this.nameField.setMaxStringLength(35);
|
this.nameField.setMaxStringLength(35);
|
||||||
this.nameField.changeFocus(true);
|
this.nameField.changeFocus(true);
|
||||||
|
|
||||||
confirm = new Button(topLeftX - 5, topLeftY + 50, 100, 20, buttonTextConfirm, button -> {
|
confirm = new Button(guiLeft - 5, guiTop + 50, 100, 20, buttonTextConfirm, button -> {
|
||||||
callback.accept(nameField.getText());
|
callback.accept(nameField.getText());
|
||||||
confirmed = true;
|
confirmed = true;
|
||||||
minecraft.displayGuiScreen(null);
|
minecraft.displayGuiScreen(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
abort = new Button(topLeftX + 100, topLeftY + 50, 100, 20, buttonTextAbort, button -> {
|
abort = new Button(guiLeft + 100, guiTop + 50, 100, 20, buttonTextAbort, button -> {
|
||||||
minecraft.displayGuiScreen(null);
|
minecraft.displayGuiScreen(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -61,8 +61,8 @@ public class TextInputPromptScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
public void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
ScreenResources.TEXT_INPUT.draw(this, topLeftX, topLeftY);
|
ScreenResources.TEXT_INPUT.draw(this, guiLeft, guiTop);
|
||||||
font.drawString(title, topLeftX + (sWidth / 2) - (font.getStringWidth(title) / 2), topLeftY + 11,
|
font.drawString(title, guiLeft + (sWidth / 2) - (font.getStringWidth(title) / 2), guiTop + 11,
|
||||||
ScreenResources.FONT_COLOR);
|
ScreenResources.FONT_COLOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,14 @@ public class ScrollInput extends AbstractSimiWidget {
|
||||||
protected Label displayLabel;
|
protected Label displayLabel;
|
||||||
|
|
||||||
protected int min, max;
|
protected int min, max;
|
||||||
|
protected int shiftStep;
|
||||||
|
|
||||||
public ScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
|
public ScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
|
||||||
super(xIn, yIn, widthIn, heightIn);
|
super(xIn, yIn, widthIn, heightIn);
|
||||||
state = 0;
|
state = 0;
|
||||||
min = 0;
|
min = 0;
|
||||||
max = 1;
|
max = 1;
|
||||||
|
shiftStep = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ScrollInput withRange(int min, int max) {
|
public ScrollInput withRange(int min, int max) {
|
||||||
|
@ -57,6 +59,11 @@ public class ScrollInput extends AbstractSimiWidget {
|
||||||
writeToLabel();
|
writeToLabel();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ScrollInput withShiftStep(int step) {
|
||||||
|
shiftStep = step;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
|
public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
|
||||||
|
@ -64,9 +71,12 @@ public class ScrollInput extends AbstractSimiWidget {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
int priorState = state;
|
int priorState = state;
|
||||||
int step = (int) Math.signum(delta) * (KeyboardHelper.isKeyDown(KeyboardHelper.LSHIFT) ? 5 : 1);
|
boolean shifted = KeyboardHelper.isKeyDown(KeyboardHelper.LSHIFT);
|
||||||
|
int step = (int) Math.signum(delta) * (shifted ? shiftStep : 1);
|
||||||
state += step;
|
state += step;
|
||||||
|
if (shifted)
|
||||||
|
state -= state % shiftStep;
|
||||||
|
|
||||||
clampState();
|
clampState();
|
||||||
|
|
||||||
if (priorState != state)
|
if (priorState != state)
|
||||||
|
@ -82,7 +92,7 @@ public class ScrollInput extends AbstractSimiWidget {
|
||||||
state = min;
|
state = min;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void onChanged() {
|
public void onChanged() {
|
||||||
if (displayLabel != null)
|
if (displayLabel != null)
|
||||||
writeToLabel();
|
writeToLabel();
|
||||||
if (onScroll != null)
|
if (onScroll != null)
|
||||||
|
@ -97,143 +107,8 @@ public class ScrollInput extends AbstractSimiWidget {
|
||||||
protected void updateTooltip() {
|
protected void updateTooltip() {
|
||||||
toolTip.clear();
|
toolTip.clear();
|
||||||
toolTip.add(TextFormatting.BLUE + title);
|
toolTip.add(TextFormatting.BLUE + title);
|
||||||
|
toolTip.add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + "Scroll to Modify");
|
||||||
|
toolTip.add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + "Shift to Scroll faster");
|
||||||
}
|
}
|
||||||
|
|
||||||
// public interface IScrollAction {
|
|
||||||
// public void onScroll(int position);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public interface ICancelableScrollAction extends IScrollAction {
|
|
||||||
// public void onScroll(int position);
|
|
||||||
//
|
|
||||||
// public boolean canScroll(int position);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// private int x, y, width, height;
|
|
||||||
// private IScrollAction action;
|
|
||||||
// public boolean enabled;
|
|
||||||
// private Optional<List<String>> tooltipContent;
|
|
||||||
// private int min, max;
|
|
||||||
// private boolean limitless;
|
|
||||||
// private boolean numeric;
|
|
||||||
//
|
|
||||||
// public ScrollArea(List<String> options, IScrollAction action) {
|
|
||||||
// this(0, options.size(), action);
|
|
||||||
// this.tooltipContent = Optional.of(options);
|
|
||||||
// updateTooltip();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public ScrollArea(int min, int max, IScrollAction action) {
|
|
||||||
// this(action);
|
|
||||||
// this.limitless = false;
|
|
||||||
// this.min = min;
|
|
||||||
// this.max = max;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public ScrollArea(IScrollAction action) {
|
|
||||||
// this.enabled = true;
|
|
||||||
// this.action = action;
|
|
||||||
// this.tooltipContent = Optional.absent();
|
|
||||||
// this.limitless = true;
|
|
||||||
// this.numeric = false;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setBounds(int x, int y, int width, int height) {
|
|
||||||
// this.x = x;
|
|
||||||
// this.y = y;
|
|
||||||
// this.width = width;
|
|
||||||
// this.height = height;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setState(int state) {
|
|
||||||
// currentState = state;
|
|
||||||
// updateTooltip();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public int getState() {
|
|
||||||
// return currentState;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public boolean isHovered(double x, double y) {
|
|
||||||
// return (x > this.x && x < this.x + this.width && y > this.y && y < this.y + this.height);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void tryScroll(double mouseX, double mouseY, int amount) {
|
|
||||||
// if (enabled && isHovered(mouseX, mouseY)) {
|
|
||||||
// scroll(numeric? -amount : amount);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setNumeric(boolean numeric) {
|
|
||||||
// this.numeric = numeric;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// private void scroll(int amount) {
|
|
||||||
// if (enabled) {
|
|
||||||
//
|
|
||||||
// if (limitless) {
|
|
||||||
// if (!(action instanceof ICancelableScrollAction)
|
|
||||||
// || ((ICancelableScrollAction) action).canScroll(amount))
|
|
||||||
// action.onScroll(amount);
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (!(action instanceof ICancelableScrollAction)
|
|
||||||
// || ((ICancelableScrollAction) action).canScroll(currentState + amount)) {
|
|
||||||
// currentState += amount;
|
|
||||||
// if (currentState < min)
|
|
||||||
// currentState = min;
|
|
||||||
// if (currentState >= max)
|
|
||||||
// currentState = max - 1;
|
|
||||||
// updateTooltip();
|
|
||||||
// action.onScroll(currentState);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void draw(Screen screen, int mouseX, int mouseY) {
|
|
||||||
// GlStateManager.pushLightingAttributes();
|
|
||||||
// if (enabled && isHovered(mouseX, mouseY)) {
|
|
||||||
// GlStateManager.pushMatrix();
|
|
||||||
// GlStateManager.translated(mouseX, mouseY,0);
|
|
||||||
// if (tooltipContent.isPresent())
|
|
||||||
// screen.renderTooltip(getToolTip(), 0, 0);
|
|
||||||
// else
|
|
||||||
// screen.renderTooltip(TextFormatting.BLUE + title, 0, 0);
|
|
||||||
// GlStateManager.popMatrix();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// GlStateManager.popAttributes();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public List<String> getToolTip() {
|
|
||||||
// return tooltip;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setTitle(String title) {
|
|
||||||
// this.title = title;
|
|
||||||
// updateTooltip();
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// private void updateTooltip() {
|
|
||||||
// tooltip = new LinkedList<>();
|
|
||||||
// tooltip.add(TextFormatting.BLUE + title);
|
|
||||||
//
|
|
||||||
// if (tooltipContent.isPresent()) {
|
|
||||||
// for (int i = min; i < max; i++) {
|
|
||||||
// StringBuilder result = new StringBuilder();
|
|
||||||
// if (i == currentState)
|
|
||||||
// result.append(TextFormatting.WHITE).append("-> ").append(tooltipContent.get().get(i));
|
|
||||||
// else
|
|
||||||
// result.append(TextFormatting.GRAY).append("> ").append(tooltipContent.get().get(i));
|
|
||||||
// tooltip.add(result.toString());
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public boolean isNumeric() {
|
|
||||||
// return numeric;
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class ItemDescription {
|
||||||
|
|
||||||
public ItemDescription withBehaviour(String condition, String behaviour) {
|
public ItemDescription withBehaviour(String condition, String behaviour) {
|
||||||
add(linesOnShift, GRAY + condition);
|
add(linesOnShift, GRAY + condition);
|
||||||
add(linesOnShift, cutString(behaviour, palette.hColor, 1));
|
add(linesOnShift, cutString(behaviour, palette.color, 1));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,8 +62,8 @@ public class BuilderGunScreen extends AbstractSimiScreen {
|
||||||
animationProgress = 0;
|
animationProgress = 0;
|
||||||
setWindowSize(ScreenResources.PLACEMENT_GUN.width + 40, ScreenResources.PLACEMENT_GUN.height);
|
setWindowSize(ScreenResources.PLACEMENT_GUN.width + 40, ScreenResources.PLACEMENT_GUN.height);
|
||||||
super.init();
|
super.init();
|
||||||
int i = topLeftX - 20;
|
int i = guiLeft - 20;
|
||||||
int j = topLeftY;
|
int j = guiTop;
|
||||||
|
|
||||||
CompoundNBT nbt = item.getOrCreateTag();
|
CompoundNBT nbt = item.getOrCreateTag();
|
||||||
|
|
||||||
|
@ -169,8 +169,8 @@ public class BuilderGunScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
int i = topLeftX - 20;
|
int i = guiLeft - 20;
|
||||||
int j = topLeftY;
|
int j = guiTop;
|
||||||
ScreenResources.PLACEMENT_GUN.draw(this, i, j);
|
ScreenResources.PLACEMENT_GUN.draw(this, i, j);
|
||||||
|
|
||||||
font.drawStringWithShadow("Handheld Blockzapper", i + 8, j + 10, 0xCCDDFF);
|
font.drawStringWithShadow("Handheld Blockzapper", i + 8, j + 10, 0xCCDDFF);
|
||||||
|
@ -213,7 +213,7 @@ public class BuilderGunScreen extends AbstractSimiScreen {
|
||||||
GlStateManager.pushMatrix();
|
GlStateManager.pushMatrix();
|
||||||
BufferBuilder buffer = Tessellator.getInstance().getBuffer();
|
BufferBuilder buffer = Tessellator.getInstance().getBuffer();
|
||||||
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK);
|
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK);
|
||||||
GlStateManager.translated(topLeftX + 1.7f, topLeftY - 49, 120);
|
GlStateManager.translated(guiLeft + 1.7f, guiTop - 49, 120);
|
||||||
GlStateManager.rotatef(-30f, .5f, .9f, -.1f);
|
GlStateManager.rotatef(-30f, .5f, .9f, -.1f);
|
||||||
GlStateManager.scaled(20, -20, 20);
|
GlStateManager.scaled(20, -20, 20);
|
||||||
|
|
||||||
|
|
|
@ -172,14 +172,15 @@ public class TreeFertilizerItem extends InfoItem {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MapData func_217406_a(String p_217406_1_) {
|
public MapData getMapData(String mapName) {
|
||||||
return wrapped.func_217406_a(p_217406_1_);
|
return wrapped.getMapData(mapName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void func_217399_a(MapData p_217399_1_) {
|
public void registerMapData(MapData mapDataIn) {
|
||||||
|
wrapped.registerMapData(mapDataIn);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getNextMapId() {
|
public int getNextMapId() {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -6,31 +6,80 @@ import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
||||||
|
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||||
|
import net.minecraft.inventory.InventoryHelper;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.BlockRayTraceResult;
|
||||||
|
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||||
|
import net.minecraft.util.math.shapes.VoxelShape;
|
||||||
import net.minecraft.world.IBlockReader;
|
import net.minecraft.world.IBlockReader;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.fml.network.NetworkHooks;
|
||||||
|
|
||||||
public class FlexCrateBlock extends InfoBlock {
|
public class FlexcrateBlock extends InfoBlock {
|
||||||
|
|
||||||
public FlexCrateBlock() {
|
public static final VoxelShape SHAPE = makeCuboidShape(1, 0, 1, 15, 14, 15);
|
||||||
|
|
||||||
|
public FlexcrateBlock() {
|
||||||
super(Properties.from(Blocks.ANDESITE));
|
super(Properties.from(Blocks.ANDESITE));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasTileEntity() {
|
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
|
||||||
|
return SHAPE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasTileEntity(BlockState state) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
|
||||||
|
BlockRayTraceResult hit) {
|
||||||
|
|
||||||
|
if (worldIn.isRemote) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
FlexcrateTileEntity te = (FlexcrateTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
if (te != null)
|
||||||
|
NetworkHooks.openGui((ServerPlayerEntity) player, te, te::sendToContainer);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
||||||
return new FlexCrateTileEntity();
|
return new FlexcrateTileEntity();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemDescription getDescription() {
|
public ItemDescription getDescription() {
|
||||||
Palette color = Palette.Yellow;
|
Palette color = Palette.Yellow;
|
||||||
return new ItemDescription(color)
|
return new ItemDescription(color)
|
||||||
.withSummary("This Storage Container allows Manual control over its capacity. Can hold up to "
|
.withSummary("This Storage Container allows Manual control over its capacity. It can hold up to "
|
||||||
+ h("16 Stacks", color) + " of Items.");
|
+ h("16 Stacks", color) + " of Items.")
|
||||||
|
.createTabs();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||||
|
if (worldIn.getTileEntity(pos) == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
FlexcrateTileEntity te = (FlexcrateTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
for (int slot = 0; slot < te.inventory.getSlots(); slot++) {
|
||||||
|
InventoryHelper.spawnItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(),
|
||||||
|
te.inventory.getStackInSlot(slot));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) {
|
||||||
|
worldIn.removeTileEntity(pos);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,28 +7,68 @@ import net.minecraft.client.world.ClientWorld;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
import net.minecraft.inventory.container.Container;
|
import net.minecraft.inventory.container.Container;
|
||||||
|
import net.minecraft.inventory.container.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.network.PacketBuffer;
|
import net.minecraft.network.PacketBuffer;
|
||||||
|
import net.minecraftforge.items.SlotItemHandler;
|
||||||
|
|
||||||
public class FlexCrateContainer extends Container {
|
public class FlexcrateContainer extends Container {
|
||||||
|
|
||||||
private FlexCrateTileEntity te;
|
public FlexcrateTileEntity te;
|
||||||
|
public PlayerInventory playerInventory;
|
||||||
|
|
||||||
public FlexCrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) {
|
public FlexcrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) {
|
||||||
super(AllContainers.SchematicTable.type, id);
|
super(AllContainers.FlexCrate.type, id);
|
||||||
ClientWorld world = Minecraft.getInstance().world;
|
ClientWorld world = Minecraft.getInstance().world;
|
||||||
this.te = (FlexCrateTileEntity) world.getTileEntity(extraData.readBlockPos());
|
this.te = (FlexcrateTileEntity) world.getTileEntity(extraData.readBlockPos());
|
||||||
this.te.handleUpdateTag(extraData.readCompoundTag());
|
this.te.handleUpdateTag(extraData.readCompoundTag());
|
||||||
|
this.playerInventory = inv;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
public FlexCrateContainer(int id, PlayerInventory inv, FlexCrateTileEntity te) {
|
public FlexcrateContainer(int id, PlayerInventory inv, FlexcrateTileEntity te) {
|
||||||
super(AllContainers.SchematicTable.type, id);
|
super(AllContainers.FlexCrate.type, id);
|
||||||
this.te = te;
|
this.te = te;
|
||||||
|
this.playerInventory = inv;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init() {
|
private void init() {
|
||||||
|
for (int row = 0; row < 4; ++row) {
|
||||||
|
for (int col = 0; col < 4; ++col) {
|
||||||
|
this.addSlot(new SlotItemHandler(te.inventory, col + row * 4, 124 + col * 18, 25 + row * 18));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// player Slots
|
||||||
|
int xOffset = 58;
|
||||||
|
int yOffset = 157;
|
||||||
|
for (int row = 0; row < 3; ++row) {
|
||||||
|
for (int col = 0; col < 9; ++col) {
|
||||||
|
this.addSlot(new Slot(playerInventory, col + row * 9 + 9, xOffset + col * 18, yOffset + row * 18));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int hotbarSlot = 0; hotbarSlot < 9; ++hotbarSlot) {
|
||||||
|
this.addSlot(new Slot(playerInventory, hotbarSlot, xOffset + hotbarSlot * 18, yOffset + 58));
|
||||||
|
}
|
||||||
|
|
||||||
|
detectAndSendChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) {
|
||||||
|
Slot clickedSlot = getSlot(index);
|
||||||
|
if (!clickedSlot.getHasStack())
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
|
||||||
|
ItemStack stack = clickedSlot.getStack();
|
||||||
|
if (index < 16)
|
||||||
|
mergeItemStack(stack, 16, inventorySlots.size(), false);
|
||||||
|
else
|
||||||
|
mergeItemStack(stack, 0, 15, false);
|
||||||
|
|
||||||
|
return ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,19 +1,93 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen;
|
import static com.simibubi.create.foundation.gui.ScreenResources.FLEXCRATE;
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.PLAYER_INVENTORY;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.simibubi.create.AllBlocks;
|
||||||
|
import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenElementRenderer;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenResources;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.Label;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.ScrollInput;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
import net.minecraft.util.text.ITextComponent;
|
import net.minecraft.util.text.ITextComponent;
|
||||||
|
|
||||||
public class FlexCrateScreen extends AbstractSimiContainerScreen<FlexCrateContainer> {
|
public class FlexcrateScreen extends AbstractSimiContainerScreen<FlexcrateContainer> {
|
||||||
|
|
||||||
public FlexCrateScreen(FlexCrateContainer container, PlayerInventory inv, ITextComponent title) {
|
private FlexcrateTileEntity te;
|
||||||
|
private Label allowedItemsLabel;
|
||||||
|
private ScrollInput allowedItems;
|
||||||
|
private int lastModification;
|
||||||
|
|
||||||
|
public FlexcrateScreen(FlexcrateContainer container, PlayerInventory inv, ITextComponent title) {
|
||||||
super(container, inv, title);
|
super(container, inv, title);
|
||||||
|
te = container.te;
|
||||||
|
lastModification = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
setWindowSize(PLAYER_INVENTORY.width + 100, FLEXCRATE.height + PLAYER_INVENTORY.height + 20);
|
||||||
|
super.init();
|
||||||
|
widgets.clear();
|
||||||
|
|
||||||
|
allowedItemsLabel = new Label(guiLeft + 100 + 70, guiTop + 107, "").colored(0xD3CBBE).withShadow();
|
||||||
|
allowedItems = new ScrollInput(guiLeft + 100 + 65, guiTop + 104, 41, 14).titled("Storage Space")
|
||||||
|
.withRange(1, 1025).writingTo(allowedItemsLabel).withShiftStep(64).setState(te.allowedAmount)
|
||||||
|
.calling(s -> lastModification = 0);
|
||||||
|
allowedItems.onChanged();
|
||||||
|
widgets.add(allowedItemsLabel);
|
||||||
|
widgets.add(allowedItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
|
int crateLeft = guiLeft + 100;
|
||||||
|
int crateTop = guiTop;
|
||||||
|
int invLeft = guiLeft + 50;
|
||||||
|
int invTop = crateTop + FLEXCRATE.height + 10;
|
||||||
|
int hFontColor = 0xD3CBBE;
|
||||||
|
int fontColor = 0x4B3A22;
|
||||||
|
|
||||||
|
FLEXCRATE.draw(this, crateLeft, crateTop);
|
||||||
|
font.drawStringWithShadow("FlexCrate", crateLeft - 3 + (FLEXCRATE.width - font.getStringWidth("FlexCrate")) / 2,
|
||||||
|
crateTop + 10, hFontColor);
|
||||||
|
String itemCount = "" + te.itemCount;
|
||||||
|
font.drawString(itemCount, crateLeft + 53 - font.getStringWidth(itemCount), crateTop + 107, fontColor);
|
||||||
|
|
||||||
|
PLAYER_INVENTORY.draw(this, invLeft, invTop);
|
||||||
|
font.drawString("Inventory", invLeft + 7, invTop + 6, 0x666666);
|
||||||
|
|
||||||
|
for (int slot = 0; slot < 16; slot++) {
|
||||||
|
if (allowedItems.getState() > slot * 64)
|
||||||
|
continue;
|
||||||
|
int x = crateLeft + 23 + (slot % 4) * 18;
|
||||||
|
int y = crateTop + 24 + (slot / 4) * 18;
|
||||||
|
ScreenResources.FLEXCRATE_LOCKED_SLOT.draw(this, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
ScreenElementRenderer.renderBlock(this::getRenderedBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
if (lastModification >= 0)
|
||||||
|
lastModification++;
|
||||||
|
|
||||||
|
if (lastModification >= 15) {
|
||||||
|
lastModification = -1;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState getRenderedBlock() {
|
||||||
|
GlStateManager.translated(guiLeft + FLEXCRATE.width + 145, guiTop + 115, 0);
|
||||||
|
GlStateManager.rotatef(50, -.5f, 1, -.2f);
|
||||||
|
return AllBlocks.FLEXCRATE.get().getDefaultState();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,18 +7,80 @@ import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
import net.minecraft.inventory.container.Container;
|
import net.minecraft.inventory.container.Container;
|
||||||
import net.minecraft.inventory.container.INamedContainerProvider;
|
import net.minecraft.inventory.container.INamedContainerProvider;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.CompoundNBT;
|
||||||
|
import net.minecraft.network.PacketBuffer;
|
||||||
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
|
import net.minecraft.util.Direction;
|
||||||
import net.minecraft.util.text.ITextComponent;
|
import net.minecraft.util.text.ITextComponent;
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
import net.minecraft.util.text.StringTextComponent;
|
||||||
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
|
import net.minecraftforge.common.util.LazyOptional;
|
||||||
|
import net.minecraftforge.items.CapabilityItemHandler;
|
||||||
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
public class FlexCrateTileEntity extends SyncedTileEntity implements INamedContainerProvider {
|
public class FlexcrateTileEntity extends SyncedTileEntity implements INamedContainerProvider {
|
||||||
|
|
||||||
public FlexCrateTileEntity() {
|
public class Inv extends ItemStackHandler {
|
||||||
super(AllTileEntities.FLEX_CRATE.type);
|
public Inv() {
|
||||||
|
super(16);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlotLimit(int slot) {
|
||||||
|
if (slot < allowedAmount / 64)
|
||||||
|
return super.getSlotLimit(slot);
|
||||||
|
else if (slot == allowedAmount / 64)
|
||||||
|
return allowedAmount % 64;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isItemValid(int slot, ItemStack stack) {
|
||||||
|
if (slot > allowedAmount / 64)
|
||||||
|
return false;
|
||||||
|
return super.isItemValid(slot, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onContentsChanged(int slot) {
|
||||||
|
super.onContentsChanged(slot);
|
||||||
|
markDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Inv inventory;
|
||||||
|
public int allowedAmount;
|
||||||
|
public int itemCount;
|
||||||
|
|
||||||
|
public FlexcrateTileEntity() {
|
||||||
|
this(AllTileEntities.FLEXCRATE.type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FlexcrateTileEntity(TileEntityType<?> type) {
|
||||||
|
super(type);
|
||||||
|
allowedAmount = 512;
|
||||||
|
itemCount = 10;
|
||||||
|
inventory = new Inv();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Container createMenu(int id, PlayerInventory inventory, PlayerEntity player) {
|
public Container createMenu(int id, PlayerInventory inventory, PlayerEntity player) {
|
||||||
return new FlexCrateContainer(id, inventory, this);
|
return new FlexcrateContainer(id, inventory, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundNBT write(CompoundNBT compound) {
|
||||||
|
compound.putInt("AllowedAmount", allowedAmount);
|
||||||
|
compound.put("Inventory", inventory.serializeNBT());
|
||||||
|
return super.write(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void read(CompoundNBT compound) {
|
||||||
|
allowedAmount = compound.getInt("AllowedAmount");
|
||||||
|
inventory.deserializeNBT(compound.getCompound("Inventory"));
|
||||||
|
super.read(compound);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -26,4 +88,17 @@ public class FlexCrateTileEntity extends SyncedTileEntity implements INamedConta
|
||||||
return new StringTextComponent(getType().getRegistryName().toString());
|
return new StringTextComponent(getType().getRegistryName().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void sendToContainer(PacketBuffer buffer) {
|
||||||
|
buffer.writeBlockPos(getPos());
|
||||||
|
buffer.writeCompoundTag(getUpdateTag());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <T> LazyOptional<T> getCapability(Capability<T> capability, Direction facing) {
|
||||||
|
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
|
||||||
|
return LazyOptional.of(() -> inventory).cast();
|
||||||
|
}
|
||||||
|
return super.getCapability(capability, facing);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,85 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import com.simibubi.create.foundation.block.InfoBlock;
|
||||||
|
import com.simibubi.create.foundation.utility.ItemDescription;
|
||||||
|
import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||||
|
import net.minecraft.inventory.InventoryHelper;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.BlockRayTraceResult;
|
||||||
|
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||||
|
import net.minecraft.util.math.shapes.VoxelShape;
|
||||||
|
import net.minecraft.world.IBlockReader;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.fml.network.NetworkHooks;
|
||||||
|
|
||||||
|
public class FlexcrateBlock extends InfoBlock {
|
||||||
|
|
||||||
|
public static final VoxelShape SHAPE = makeCuboidShape(1, 0, 1, 15, 14, 15);
|
||||||
|
|
||||||
|
public FlexcrateBlock() {
|
||||||
|
super(Properties.from(Blocks.ANDESITE));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
|
||||||
|
return SHAPE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasTileEntity(BlockState state) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
|
||||||
|
BlockRayTraceResult hit) {
|
||||||
|
|
||||||
|
if (worldIn.isRemote) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
FlexcrateTileEntity te = (FlexcrateTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
if (te != null)
|
||||||
|
NetworkHooks.openGui((ServerPlayerEntity) player, te, te::sendToContainer);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
||||||
|
return new FlexcrateTileEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemDescription getDescription() {
|
||||||
|
Palette color = Palette.Yellow;
|
||||||
|
return new ItemDescription(color)
|
||||||
|
.withSummary("This Storage Container allows Manual control over its capacity. It can hold up to "
|
||||||
|
+ h("16 Stacks", color) + " of Items.")
|
||||||
|
.createTabs();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||||
|
if (worldIn.getTileEntity(pos) == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
FlexcrateTileEntity te = (FlexcrateTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
for (int slot = 0; slot < te.inventory.getSlots(); slot++) {
|
||||||
|
InventoryHelper.spawnItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(),
|
||||||
|
te.inventory.getStackInSlot(slot));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) {
|
||||||
|
worldIn.removeTileEntity(pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,79 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import com.simibubi.create.AllContainers;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.world.ClientWorld;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
|
import net.minecraft.inventory.container.Container;
|
||||||
|
import net.minecraft.inventory.container.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.network.PacketBuffer;
|
||||||
|
import net.minecraftforge.items.SlotItemHandler;
|
||||||
|
|
||||||
|
public class FlexcrateContainer extends Container {
|
||||||
|
|
||||||
|
public FlexcrateTileEntity te;
|
||||||
|
public PlayerInventory playerInventory;
|
||||||
|
|
||||||
|
public FlexcrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) {
|
||||||
|
super(AllContainers.FlexCrate.type, id);
|
||||||
|
ClientWorld world = Minecraft.getInstance().world;
|
||||||
|
this.te = (FlexcrateTileEntity) world.getTileEntity(extraData.readBlockPos());
|
||||||
|
this.te.handleUpdateTag(extraData.readCompoundTag());
|
||||||
|
this.playerInventory = inv;
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public FlexcrateContainer(int id, PlayerInventory inv, FlexcrateTileEntity te) {
|
||||||
|
super(AllContainers.FlexCrate.type, id);
|
||||||
|
this.te = te;
|
||||||
|
this.playerInventory = inv;
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void init() {
|
||||||
|
for (int row = 0; row < 4; ++row) {
|
||||||
|
for (int col = 0; col < 4; ++col) {
|
||||||
|
this.addSlot(new SlotItemHandler(te.inventory, col + row * 4, 124 + col * 18, 25 + row * 18));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// player Slots
|
||||||
|
int xOffset = 58;
|
||||||
|
int yOffset = 157;
|
||||||
|
for (int row = 0; row < 3; ++row) {
|
||||||
|
for (int col = 0; col < 9; ++col) {
|
||||||
|
this.addSlot(new Slot(playerInventory, col + row * 9 + 9, xOffset + col * 18, yOffset + row * 18));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int hotbarSlot = 0; hotbarSlot < 9; ++hotbarSlot) {
|
||||||
|
this.addSlot(new Slot(playerInventory, hotbarSlot, xOffset + hotbarSlot * 18, yOffset + 58));
|
||||||
|
}
|
||||||
|
|
||||||
|
detectAndSendChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) {
|
||||||
|
Slot clickedSlot = getSlot(index);
|
||||||
|
if (!clickedSlot.getHasStack())
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
|
||||||
|
ItemStack stack = clickedSlot.getStack();
|
||||||
|
if (index < 16)
|
||||||
|
mergeItemStack(stack, 16, inventorySlots.size(), false);
|
||||||
|
else
|
||||||
|
mergeItemStack(stack, 0, 15, false);
|
||||||
|
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canInteractWith(PlayerEntity playerIn) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,93 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.FLEXCRATE;
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.PLAYER_INVENTORY;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.simibubi.create.AllBlocks;
|
||||||
|
import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenElementRenderer;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenResources;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.Label;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.ScrollInput;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
|
import net.minecraft.util.text.ITextComponent;
|
||||||
|
|
||||||
|
public class FlexcrateScreen extends AbstractSimiContainerScreen<FlexcrateContainer> {
|
||||||
|
|
||||||
|
private FlexcrateTileEntity te;
|
||||||
|
private Label allowedItemsLabel;
|
||||||
|
private ScrollInput allowedItems;
|
||||||
|
private int lastModification;
|
||||||
|
|
||||||
|
public FlexcrateScreen(FlexcrateContainer container, PlayerInventory inv, ITextComponent title) {
|
||||||
|
super(container, inv, title);
|
||||||
|
te = container.te;
|
||||||
|
lastModification = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
setWindowSize(PLAYER_INVENTORY.width + 100, FLEXCRATE.height + PLAYER_INVENTORY.height + 20);
|
||||||
|
super.init();
|
||||||
|
widgets.clear();
|
||||||
|
|
||||||
|
allowedItemsLabel = new Label(guiLeft + 100 + 70, guiTop + 107, "").colored(0xD3CBBE).withShadow();
|
||||||
|
allowedItems = new ScrollInput(guiLeft + 100 + 65, guiTop + 104, 41, 14).titled("Storage Space")
|
||||||
|
.withRange(1, 1025).writingTo(allowedItemsLabel).withShiftStep(64).setState(te.allowedAmount)
|
||||||
|
.calling(s -> lastModification = 0);
|
||||||
|
allowedItems.onChanged();
|
||||||
|
widgets.add(allowedItemsLabel);
|
||||||
|
widgets.add(allowedItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
|
int crateLeft = guiLeft + 100;
|
||||||
|
int crateTop = guiTop;
|
||||||
|
int invLeft = guiLeft + 50;
|
||||||
|
int invTop = crateTop + FLEXCRATE.height + 10;
|
||||||
|
int hFontColor = 0xD3CBBE;
|
||||||
|
int fontColor = 0x4B3A22;
|
||||||
|
|
||||||
|
FLEXCRATE.draw(this, crateLeft, crateTop);
|
||||||
|
font.drawStringWithShadow("FlexCrate", crateLeft - 3 + (FLEXCRATE.width - font.getStringWidth("FlexCrate")) / 2,
|
||||||
|
crateTop + 10, hFontColor);
|
||||||
|
String itemCount = "" + te.itemCount;
|
||||||
|
font.drawString(itemCount, crateLeft + 53 - font.getStringWidth(itemCount), crateTop + 107, fontColor);
|
||||||
|
|
||||||
|
PLAYER_INVENTORY.draw(this, invLeft, invTop);
|
||||||
|
font.drawString("Inventory", invLeft + 7, invTop + 6, 0x666666);
|
||||||
|
|
||||||
|
for (int slot = 0; slot < 16; slot++) {
|
||||||
|
if (allowedItems.getState() > slot * 64)
|
||||||
|
continue;
|
||||||
|
int x = crateLeft + 23 + (slot % 4) * 18;
|
||||||
|
int y = crateTop + 24 + (slot / 4) * 18;
|
||||||
|
ScreenResources.FLEXCRATE_LOCKED_SLOT.draw(this, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
ScreenElementRenderer.renderBlock(this::getRenderedBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
if (lastModification >= 0)
|
||||||
|
lastModification++;
|
||||||
|
|
||||||
|
if (lastModification >= 15) {
|
||||||
|
lastModification = -1;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState getRenderedBlock() {
|
||||||
|
GlStateManager.translated(guiLeft + FLEXCRATE.width + 145, guiTop + 115, 0);
|
||||||
|
GlStateManager.rotatef(50, -.5f, 1, -.2f);
|
||||||
|
return AllBlocks.FLEXCRATE.get().getDefaultState();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,104 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import com.simibubi.create.AllTileEntities;
|
||||||
|
import com.simibubi.create.foundation.block.SyncedTileEntity;
|
||||||
|
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.entity.player.PlayerInventory;
|
||||||
|
import net.minecraft.inventory.container.Container;
|
||||||
|
import net.minecraft.inventory.container.INamedContainerProvider;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.CompoundNBT;
|
||||||
|
import net.minecraft.network.PacketBuffer;
|
||||||
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
|
import net.minecraft.util.Direction;
|
||||||
|
import net.minecraft.util.text.ITextComponent;
|
||||||
|
import net.minecraft.util.text.StringTextComponent;
|
||||||
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
|
import net.minecraftforge.common.util.LazyOptional;
|
||||||
|
import net.minecraftforge.items.CapabilityItemHandler;
|
||||||
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
|
public class FlexcrateTileEntity extends SyncedTileEntity implements INamedContainerProvider {
|
||||||
|
|
||||||
|
public class Inv extends ItemStackHandler {
|
||||||
|
public Inv() {
|
||||||
|
super(16);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlotLimit(int slot) {
|
||||||
|
if (slot < allowedAmount / 64)
|
||||||
|
return super.getSlotLimit(slot);
|
||||||
|
else if (slot == allowedAmount / 64)
|
||||||
|
return allowedAmount % 64;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isItemValid(int slot, ItemStack stack) {
|
||||||
|
if (slot > allowedAmount / 64)
|
||||||
|
return false;
|
||||||
|
return super.isItemValid(slot, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onContentsChanged(int slot) {
|
||||||
|
super.onContentsChanged(slot);
|
||||||
|
markDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Inv inventory;
|
||||||
|
public int allowedAmount;
|
||||||
|
public int itemCount;
|
||||||
|
|
||||||
|
public FlexcrateTileEntity() {
|
||||||
|
this(AllTileEntities.FLEXCRATE.type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FlexcrateTileEntity(TileEntityType<?> type) {
|
||||||
|
super(type);
|
||||||
|
allowedAmount = 512;
|
||||||
|
itemCount = 10;
|
||||||
|
inventory = new Inv();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Container createMenu(int id, PlayerInventory inventory, PlayerEntity player) {
|
||||||
|
return new FlexcrateContainer(id, inventory, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundNBT write(CompoundNBT compound) {
|
||||||
|
compound.putInt("AllowedAmount", allowedAmount);
|
||||||
|
compound.put("Inventory", inventory.serializeNBT());
|
||||||
|
return super.write(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void read(CompoundNBT compound) {
|
||||||
|
allowedAmount = compound.getInt("AllowedAmount");
|
||||||
|
inventory.deserializeNBT(compound.getCompound("Inventory"));
|
||||||
|
super.read(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ITextComponent getDisplayName() {
|
||||||
|
return new StringTextComponent(getType().getRegistryName().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void sendToContainer(PacketBuffer buffer) {
|
||||||
|
buffer.writeBlockPos(getPos());
|
||||||
|
buffer.writeCompoundTag(getUpdateTag());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <T> LazyOptional<T> getCapability(Capability<T> capability, Direction facing) {
|
||||||
|
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
|
||||||
|
return LazyOptional.of(() -> inventory).cast();
|
||||||
|
}
|
||||||
|
return super.getCapability(capability, facing);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,17 +1,28 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.simibubi.create.AllBlocks;
|
||||||
import com.simibubi.create.foundation.block.ProperDirectionalBlock;
|
import com.simibubi.create.foundation.block.ProperDirectionalBlock;
|
||||||
import com.simibubi.create.foundation.utility.ITooltip;
|
import com.simibubi.create.foundation.utility.ITooltip;
|
||||||
import com.simibubi.create.foundation.utility.ItemDescription;
|
import com.simibubi.create.foundation.utility.ItemDescription;
|
||||||
import com.simibubi.create.foundation.utility.TooltipHolder;
|
|
||||||
import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
||||||
|
import com.simibubi.create.foundation.utility.TessellatorHelper;
|
||||||
|
import com.simibubi.create.foundation.utility.TooltipHolder;
|
||||||
|
import com.simibubi.create.foundation.utility.VecHelper;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.WorldRenderer;
|
||||||
import net.minecraft.client.util.ITooltipFlag;
|
import net.minecraft.client.util.ITooltipFlag;
|
||||||
|
import net.minecraft.client.world.ClientWorld;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.item.BlockItemUseContext;
|
import net.minecraft.item.BlockItemUseContext;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.state.BooleanProperty;
|
import net.minecraft.state.BooleanProperty;
|
||||||
|
@ -20,37 +31,126 @@ import net.minecraft.state.properties.BlockStateProperties;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.BlockRenderLayer;
|
import net.minecraft.util.BlockRenderLayer;
|
||||||
import net.minecraft.util.Direction;
|
import net.minecraft.util.Direction;
|
||||||
|
import net.minecraft.util.Direction.Axis;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.math.AxisAlignedBB;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.BlockRayTraceResult;
|
||||||
|
import net.minecraft.util.math.Vec3d;
|
||||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||||
import net.minecraft.util.math.shapes.VoxelShape;
|
import net.minecraft.util.math.shapes.VoxelShape;
|
||||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||||
import net.minecraft.util.text.ITextComponent;
|
import net.minecraft.util.text.ITextComponent;
|
||||||
import net.minecraft.world.IBlockReader;
|
import net.minecraft.world.IBlockReader;
|
||||||
|
import net.minecraft.world.IWorld;
|
||||||
import net.minecraft.world.IWorldReader;
|
import net.minecraft.world.IWorldReader;
|
||||||
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||||
|
|
||||||
|
@EventBusSubscriber(value = Dist.CLIENT)
|
||||||
public class RedstoneBridgeBlock extends ProperDirectionalBlock implements ITooltip {
|
public class RedstoneBridgeBlock extends ProperDirectionalBlock implements ITooltip {
|
||||||
|
|
||||||
public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
|
public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
|
||||||
|
public static final BooleanProperty RECEIVER = BooleanProperty.create("receiver");
|
||||||
|
private static final List<Pair<Vec3d, Vec3d>> itemPositions = new ArrayList<>(Direction.values().length);
|
||||||
|
|
||||||
public static final VoxelShape UP_SHAPE = makeCuboidShape(2, 0, 2, 14, 3, 14),
|
public static final VoxelShape UP_SHAPE = makeCuboidShape(2, 0, 2, 14, 3, 14),
|
||||||
DOWN_SHAPE = makeCuboidShape(2, 13, 2, 14, 16, 14);
|
DOWN_SHAPE = makeCuboidShape(2, 13, 2, 14, 16, 14);
|
||||||
|
|
||||||
public static final VoxelShape SOUTH_SHAPE = makeCuboidShape(3, 1, -1, 13, 15, 2),
|
public static final VoxelShape
|
||||||
NORTH_SHAPE = makeCuboidShape(3, 1, 14, 13, 15, 17), EAST_SHAPE = makeCuboidShape(-1, 1, 3, 2, 15, 13),
|
SOUTH_SHAPE = makeCuboidShape(3, 1, -1, 13, 15, 3),
|
||||||
WEST_SHAPE = makeCuboidShape(14, 1, 3, 17, 15, 13);
|
NORTH_SHAPE = makeCuboidShape(3, 1, 13, 13, 15, 17),
|
||||||
|
EAST_SHAPE = makeCuboidShape(-1, 1, 3, 3, 15, 13),
|
||||||
|
WEST_SHAPE = makeCuboidShape(13, 1, 3, 17, 15, 13);
|
||||||
|
|
||||||
private TooltipHolder info;
|
private TooltipHolder info;
|
||||||
|
|
||||||
public RedstoneBridgeBlock() {
|
public RedstoneBridgeBlock() {
|
||||||
super(Properties.from(Blocks.DARK_OAK_LOG));
|
super(Properties.from(Blocks.DARK_OAK_LOG));
|
||||||
info = new TooltipHolder(this);
|
info = new TooltipHolder(this);
|
||||||
|
cacheItemPositions();
|
||||||
|
setDefaultState(getDefaultState().with(POWERED, false).with(RECEIVER, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
|
||||||
|
boolean isMoving) {
|
||||||
|
Direction blockFacing = state.get(FACING);
|
||||||
|
|
||||||
|
if (fromPos.equals(pos.offset(blockFacing.getOpposite()))) {
|
||||||
|
if (!isValidPosition(state, worldIn, pos)) {
|
||||||
|
worldIn.destroyBlock(pos, true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (worldIn.isRemote)
|
||||||
|
return;
|
||||||
|
if (state.get(RECEIVER))
|
||||||
|
return;
|
||||||
|
|
||||||
|
boolean previouslyPowered = state.get(POWERED);
|
||||||
|
if (previouslyPowered != worldIn.isBlockPowered(pos.offset(blockFacing.getOpposite()))) {
|
||||||
|
worldIn.setBlockState(pos, state.cycle(POWERED), 2);
|
||||||
|
|
||||||
|
RedstoneBridgeTileEntity te = (RedstoneBridgeTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
if (te == null)
|
||||||
|
return;
|
||||||
|
te.blockChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn,
|
||||||
|
BlockPos currentPos, BlockPos facingPos) {
|
||||||
|
boolean shouldPower = false;
|
||||||
|
Direction blockFacing = stateIn.get(FACING);
|
||||||
|
|
||||||
|
if (worldIn.getWorld().isRemote)
|
||||||
|
return stateIn;
|
||||||
|
if (stateIn.get(RECEIVER))
|
||||||
|
return stateIn;
|
||||||
|
|
||||||
|
shouldPower = worldIn.getWorld().isBlockPowered(currentPos.offset(blockFacing.getOpposite()))
|
||||||
|
|| worldIn.getWorld().isBlockPowered(currentPos);
|
||||||
|
if (stateIn.get(POWERED) != shouldPower) {
|
||||||
|
|
||||||
|
RedstoneBridgeTileEntity te = (RedstoneBridgeTileEntity) worldIn.getTileEntity(currentPos);
|
||||||
|
if (te == null)
|
||||||
|
return stateIn;
|
||||||
|
te.blockChanged();
|
||||||
|
|
||||||
|
return stateIn.with(POWERED, shouldPower);
|
||||||
|
}
|
||||||
|
return stateIn;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canProvidePower(BlockState state) {
|
||||||
|
return state.get(POWERED) && state.get(RECEIVER);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getStrongPower(BlockState blockState, IBlockReader blockAccess, BlockPos pos, Direction side) {
|
||||||
|
if (side != blockState.get(FACING))
|
||||||
|
return 0;
|
||||||
|
return getWeakPower(blockState, blockAccess, pos, side);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getWeakPower(BlockState state, IBlockReader blockAccess, BlockPos pos, Direction side) {
|
||||||
|
if (!state.get(RECEIVER))
|
||||||
|
return 0;
|
||||||
|
return state.get(POWERED) ? 15 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void fillStateContainer(Builder<Block, BlockState> builder) {
|
protected void fillStateContainer(Builder<Block, BlockState> builder) {
|
||||||
builder.add(POWERED);
|
builder.add(POWERED, RECEIVER);
|
||||||
super.fillStateContainer(builder);
|
super.fillStateContainer(builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,6 +164,107 @@ public class RedstoneBridgeBlock extends ProperDirectionalBlock implements ITool
|
||||||
return new RedstoneBridgeTileEntity();
|
return new RedstoneBridgeTileEntity();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
|
||||||
|
BlockRayTraceResult hit) {
|
||||||
|
Direction facing = state.get(FACING);
|
||||||
|
Pair<Vec3d, Vec3d> positions = itemPositions.get(facing.getIndex());
|
||||||
|
ItemStack stack = player.getHeldItem(handIn);
|
||||||
|
RedstoneBridgeTileEntity te = (RedstoneBridgeTileEntity) worldIn.getTileEntity(pos);
|
||||||
|
|
||||||
|
if (te == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (player.isSneaking()) {
|
||||||
|
if (!worldIn.isRemote) {
|
||||||
|
worldIn.setBlockState(pos, state.cycle(RECEIVER));
|
||||||
|
te.blockChanged();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vec3d vec = new Vec3d(pos);
|
||||||
|
Vec3d first = positions.getLeft().add(vec);
|
||||||
|
Vec3d second = positions.getRight().add(vec);
|
||||||
|
|
||||||
|
if (new AxisAlignedBB(first, first).grow(2 / 16f).contains(hit.getHitVec())) {
|
||||||
|
if (worldIn.isRemote)
|
||||||
|
return true;
|
||||||
|
te.setFrequency(true, stack);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (new AxisAlignedBB(second, second).grow(2 / 16f).contains(hit.getHitVec())) {
|
||||||
|
if (worldIn.isRemote)
|
||||||
|
return true;
|
||||||
|
te.setFrequency(false, stack);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
public static void onDrawBlockHighlight(DrawBlockHighlightEvent event) {
|
||||||
|
if (event.getTarget() == null || !(event.getTarget() instanceof BlockRayTraceResult))
|
||||||
|
return;
|
||||||
|
|
||||||
|
BlockRayTraceResult result = (BlockRayTraceResult) event.getTarget();
|
||||||
|
ClientWorld world = Minecraft.getInstance().world;
|
||||||
|
BlockPos pos = result.getPos();
|
||||||
|
BlockState state = world.getBlockState(pos);
|
||||||
|
|
||||||
|
if (!AllBlocks.REDSTONE_BRIDGE.typeOf(state))
|
||||||
|
return;
|
||||||
|
|
||||||
|
Direction facing = state.get(FACING);
|
||||||
|
Pair<Vec3d, Vec3d> positions = itemPositions.get(facing.getIndex());
|
||||||
|
RedstoneBridgeTileEntity te = (RedstoneBridgeTileEntity) world.getTileEntity(pos);
|
||||||
|
|
||||||
|
if (te == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Vec3d vec = new Vec3d(pos);
|
||||||
|
Vec3d first = positions.getLeft().add(vec);
|
||||||
|
Vec3d second = positions.getRight().add(vec);
|
||||||
|
|
||||||
|
AxisAlignedBB firstBB = new AxisAlignedBB(first, first).grow(2 / 16f);
|
||||||
|
AxisAlignedBB secondBB = new AxisAlignedBB(second, second).grow(2 / 16f);
|
||||||
|
|
||||||
|
TessellatorHelper.prepareForDrawing();
|
||||||
|
GlStateManager.enableBlend();
|
||||||
|
GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA,
|
||||||
|
GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE,
|
||||||
|
GlStateManager.DestFactor.ZERO);
|
||||||
|
GlStateManager.disableTexture();
|
||||||
|
GlStateManager.depthMask(false);
|
||||||
|
GlStateManager.matrixMode(5889);
|
||||||
|
|
||||||
|
if (firstBB.contains(result.getHitVec())) {
|
||||||
|
GlStateManager.lineWidth(2);
|
||||||
|
WorldRenderer.drawSelectionBoundingBox(firstBB.grow(1 / 128f), 1, 1, .5f, 1f);
|
||||||
|
} else {
|
||||||
|
GlStateManager.lineWidth(2);
|
||||||
|
WorldRenderer.drawSelectionBoundingBox(firstBB.grow(1 / 128f), .5f, .5f, .2f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secondBB.contains(result.getHitVec())) {
|
||||||
|
GlStateManager.lineWidth(2);
|
||||||
|
WorldRenderer.drawSelectionBoundingBox(secondBB.grow(1 / 128f), 1, 1, .5f, 1f);
|
||||||
|
} else {
|
||||||
|
GlStateManager.lineWidth(2);
|
||||||
|
WorldRenderer.drawSelectionBoundingBox(secondBB.grow(1 / 128f), .5f, .5f, .2f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
GlStateManager.matrixMode(5888);
|
||||||
|
GlStateManager.depthMask(true);
|
||||||
|
GlStateManager.enableTexture();
|
||||||
|
GlStateManager.disableBlend();
|
||||||
|
GlStateManager.lineWidth(1);
|
||||||
|
TessellatorHelper.cleanUpAfterDrawing();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos pos, Direction side) {
|
public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos pos, Direction side) {
|
||||||
return state.get(FACING) == Direction.UP;
|
return state.get(FACING) == Direction.UP;
|
||||||
|
@ -108,6 +309,47 @@ public class RedstoneBridgeBlock extends ProperDirectionalBlock implements ITool
|
||||||
return VoxelShapes.empty();
|
return VoxelShapes.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cacheItemPositions() {
|
||||||
|
if (!itemPositions.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
Vec3d first = Vec3d.ZERO;
|
||||||
|
Vec3d second = Vec3d.ZERO;
|
||||||
|
Vec3d shift = VecHelper.getCenterOf(BlockPos.ZERO);
|
||||||
|
float zFightOffset = 1 / 128f;
|
||||||
|
|
||||||
|
for (Direction facing : Direction.values()) {
|
||||||
|
if (facing.getAxis().isHorizontal()) {
|
||||||
|
first = new Vec3d(10 / 16f, 5.5f / 16f, 2f / 16f + zFightOffset);
|
||||||
|
second = new Vec3d(10 / 16f, 10.5f / 16f, 2f / 16f + zFightOffset);
|
||||||
|
|
||||||
|
float angle = facing.getHorizontalAngle();
|
||||||
|
if (facing.getAxis() == Axis.X)
|
||||||
|
angle = -angle;
|
||||||
|
|
||||||
|
first = VecHelper.rotate(first.subtract(shift), angle, Axis.Y).add(shift);
|
||||||
|
second = VecHelper.rotate(second.subtract(shift), angle, Axis.Y).add(shift);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
first = new Vec3d(10 / 16f, 2f / 16f + zFightOffset, 5.5f / 16f);
|
||||||
|
second = new Vec3d(10 / 16f, 2f / 16f + zFightOffset, 10.5f / 16f);
|
||||||
|
|
||||||
|
if (facing == Direction.DOWN) {
|
||||||
|
first = VecHelper.rotate(first.subtract(shift), 180, Axis.X).add(shift);
|
||||||
|
second = VecHelper.rotate(second.subtract(shift), 180, Axis.X).add(shift);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
itemPositions.add(Pair.of(first, second));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Pair<Vec3d, Vec3d> getFrequencyItemPositions(BlockState state) {
|
||||||
|
Direction facing = state.get(FACING);
|
||||||
|
return itemPositions.get(facing.getIndex());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@OnlyIn(value = Dist.CLIENT)
|
@OnlyIn(value = Dist.CLIENT)
|
||||||
public void addInformation(ItemStack stack, IBlockReader worldIn, List<ITextComponent> tooltip,
|
public void addInformation(ItemStack stack, IBlockReader worldIn, List<ITextComponent> tooltip,
|
||||||
|
@ -128,6 +370,8 @@ public class RedstoneBridgeBlock extends ProperDirectionalBlock implements ITool
|
||||||
"Sets the " + h("Frequency", color) + " to that item. A total of "
|
"Sets the " + h("Frequency", color) + " to that item. A total of "
|
||||||
+ h("two different items", color)
|
+ h("two different items", color)
|
||||||
+ " can be used in combination for defining a Frequency.")
|
+ " can be used in combination for defining a Frequency.")
|
||||||
|
.withControl("When R-Clicked while Sneaking",
|
||||||
|
"Toggles between " + h("Receiver", color) + " and " + h("Transmitter", color) + " Mode. ")
|
||||||
.createTabs();
|
.createTabs();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import static net.minecraft.state.properties.BlockStateProperties.POWERED;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -12,8 +15,12 @@ import com.simibubi.create.foundation.block.SyncedTileEntity;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.CompoundNBT;
|
import net.minecraft.nbt.CompoundNBT;
|
||||||
|
import net.minecraft.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.tileentity.ITickableTileEntity;
|
||||||
|
import net.minecraft.util.Direction;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
|
||||||
public class RedstoneBridgeTileEntity extends SyncedTileEntity {
|
public class RedstoneBridgeTileEntity extends SyncedTileEntity implements ITickableTileEntity {
|
||||||
|
|
||||||
public static final int RANGE = 128;
|
public static final int RANGE = 128;
|
||||||
|
|
||||||
|
@ -50,11 +57,15 @@ public class RedstoneBridgeTileEntity extends SyncedTileEntity {
|
||||||
|
|
||||||
public Frequency frequencyFirst;
|
public Frequency frequencyFirst;
|
||||||
public Frequency frequencyLast;
|
public Frequency frequencyLast;
|
||||||
|
public boolean networkChanged;
|
||||||
|
|
||||||
public RedstoneBridgeTileEntity() {
|
public RedstoneBridgeTileEntity() {
|
||||||
super(AllTileEntities.REDSTONE_BRIDGE.type);
|
super(AllTileEntities.REDSTONE_BRIDGE.type);
|
||||||
frequencyFirst = new Frequency(ItemStack.EMPTY);
|
frequencyFirst = new Frequency(ItemStack.EMPTY);
|
||||||
frequencyLast = new Frequency(ItemStack.EMPTY);
|
frequencyLast = new Frequency(ItemStack.EMPTY);
|
||||||
|
|
||||||
|
if (connections == null)
|
||||||
|
connections = new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -63,26 +74,97 @@ public class RedstoneBridgeTileEntity extends SyncedTileEntity {
|
||||||
if (world.isRemote)
|
if (world.isRemote)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Pair<Frequency, Frequency> networkKey = getNetworkKey();
|
addToNetwork();
|
||||||
List<RedstoneBridgeTileEntity> TEs = connections.getOrDefault(networkKey, new ArrayList<>());
|
|
||||||
TEs.add(this);
|
|
||||||
connections.put(networkKey, TEs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void remove() {
|
public void remove() {
|
||||||
super.remove();
|
super.remove();
|
||||||
|
if (world.isRemote)
|
||||||
|
return;
|
||||||
|
|
||||||
Pair<Frequency, Frequency> networkKey = getNetworkKey();
|
removeFromNetwork();
|
||||||
List<RedstoneBridgeTileEntity> TEs = connections.get(networkKey);
|
}
|
||||||
if (TEs != null)
|
|
||||||
TEs.remove(this);
|
public void setFrequency(boolean first, ItemStack stack) {
|
||||||
|
stack = stack.copy();
|
||||||
|
stack.setCount(1);
|
||||||
|
ItemStack toCompare = first ? frequencyFirst.stack : frequencyLast.stack;
|
||||||
|
boolean changed = !ItemStack.areItemsEqual(stack, toCompare)
|
||||||
|
|| !ItemStack.areItemStackTagsEqual(stack, toCompare);
|
||||||
|
|
||||||
|
if (changed)
|
||||||
|
removeFromNetwork();
|
||||||
|
|
||||||
|
if (first)
|
||||||
|
frequencyFirst = new Frequency(stack);
|
||||||
|
else
|
||||||
|
frequencyLast = new Frequency(stack);
|
||||||
|
|
||||||
|
if (!changed)
|
||||||
|
return;
|
||||||
|
|
||||||
|
world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), 18);
|
||||||
|
addToNetwork();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Pair<Frequency, Frequency> getNetworkKey() {
|
protected Pair<Frequency, Frequency> getNetworkKey() {
|
||||||
return Pair.of(frequencyFirst, frequencyLast);
|
return Pair.of(frequencyFirst, frequencyLast);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void addToNetwork() {
|
||||||
|
Pair<Frequency, Frequency> networkKey = getNetworkKey();
|
||||||
|
List<RedstoneBridgeTileEntity> TEs = connections.getOrDefault(networkKey, new ArrayList<>());
|
||||||
|
TEs.add(this);
|
||||||
|
connections.put(networkKey, TEs);
|
||||||
|
notifyNetwork();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void removeFromNetwork() {
|
||||||
|
Pair<Frequency, Frequency> networkKey = getNetworkKey();
|
||||||
|
List<RedstoneBridgeTileEntity> TEs = connections.get(networkKey);
|
||||||
|
if (TEs != null)
|
||||||
|
TEs.remove(this);
|
||||||
|
if (TEs.isEmpty()) {
|
||||||
|
connections.remove(networkKey);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
notifyNetwork();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean isNetworkPowered() {
|
||||||
|
List<RedstoneBridgeTileEntity> TEs = connections.get(getNetworkKey());
|
||||||
|
for (RedstoneBridgeTileEntity te : TEs) {
|
||||||
|
if (te == this)
|
||||||
|
continue;
|
||||||
|
if (te.canProvideNetworkPower())
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void notifyNetwork() {
|
||||||
|
for (RedstoneBridgeTileEntity te : connections.get(getNetworkKey()))
|
||||||
|
te.networkChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean canProvideNetworkPower() {
|
||||||
|
return isBlockPowered() && isTransmitter();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isTransmitter() {
|
||||||
|
return !getBlockState().get(RedstoneBridgeBlock.RECEIVER);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isBlockPowered() {
|
||||||
|
return getBlockState().get(POWERED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void blockChanged() {
|
||||||
|
notifyNetwork();
|
||||||
|
networkChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CompoundNBT write(CompoundNBT compound) {
|
public CompoundNBT write(CompoundNBT compound) {
|
||||||
compound.put("FrequencyFirst", frequencyFirst.getStack().write(new CompoundNBT()));
|
compound.put("FrequencyFirst", frequencyFirst.getStack().write(new CompoundNBT()));
|
||||||
|
@ -97,4 +179,21 @@ public class RedstoneBridgeTileEntity extends SyncedTileEntity {
|
||||||
super.read(compound);
|
super.read(compound);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
if (!networkChanged)
|
||||||
|
return;
|
||||||
|
networkChanged = false;
|
||||||
|
|
||||||
|
if (isTransmitter())
|
||||||
|
return;
|
||||||
|
if (isNetworkPowered() != isBlockPowered()) {
|
||||||
|
world.setBlockState(pos, getBlockState().cycle(POWERED));
|
||||||
|
Direction attachedFace = getBlockState().get(BlockStateProperties.FACING).getOpposite();
|
||||||
|
BlockPos attachedPos = pos.offset(attachedFace);
|
||||||
|
world.notifyNeighbors(attachedPos, world.getBlockState(attachedPos).getBlock());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.simibubi.create.foundation.utility.TessellatorHelper;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.ItemRenderer;
|
||||||
|
import net.minecraft.client.renderer.model.IBakedModel;
|
||||||
|
import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
|
||||||
|
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.util.Direction;
|
||||||
|
import net.minecraft.util.Direction.Axis;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.Vec3d;
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public class RedstoneBridgeTileEntityRenderer extends TileEntityRenderer<RedstoneBridgeTileEntity> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(RedstoneBridgeTileEntity tileEntityIn, double x, double y, double z, float partialTicks,
|
||||||
|
int destroyStage) {
|
||||||
|
super.render(tileEntityIn, x, y, z, partialTicks, destroyStage);
|
||||||
|
|
||||||
|
Direction facing = tileEntityIn.getBlockState().get(BlockStateProperties.FACING);
|
||||||
|
|
||||||
|
TessellatorHelper.prepareForDrawing();
|
||||||
|
|
||||||
|
Pair<Vec3d, Vec3d> itemPositions = RedstoneBridgeBlock.getFrequencyItemPositions(tileEntityIn.getBlockState());
|
||||||
|
Vec3d first = itemPositions.getLeft();
|
||||||
|
Vec3d second = itemPositions.getRight();
|
||||||
|
BlockPos pos = tileEntityIn.getPos();
|
||||||
|
GlStateManager.translated(pos.getX(), pos.getY(), pos.getZ());
|
||||||
|
|
||||||
|
renderFrequencyItem(tileEntityIn.frequencyFirst.getStack(), first, facing);
|
||||||
|
renderFrequencyItem(tileEntityIn.frequencyLast.getStack(), second, facing);
|
||||||
|
|
||||||
|
TessellatorHelper.cleanUpAfterDrawing();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void renderFrequencyItem(ItemStack stack, Vec3d position, Direction facing) {
|
||||||
|
ItemRenderer itemRenderer = Minecraft.getInstance().getItemRenderer();
|
||||||
|
boolean vertical = facing.getAxis().isVertical();
|
||||||
|
|
||||||
|
IBakedModel modelWithOverrides = itemRenderer.getModelWithOverrides(stack);
|
||||||
|
boolean blockItem = modelWithOverrides.isGui3d();
|
||||||
|
|
||||||
|
float offX = 0;
|
||||||
|
float offY = vertical && !blockItem ? 0 : 0;
|
||||||
|
float offZ = !blockItem ? 1/4f : 0;
|
||||||
|
if (vertical)
|
||||||
|
offZ = -offZ;
|
||||||
|
|
||||||
|
float rotX = vertical ? 90 : 0;
|
||||||
|
float rotY = vertical ? 0 : facing.getHorizontalAngle() + (blockItem ? 180 : 0);
|
||||||
|
float rotZ = vertical && facing == Direction.DOWN ? 180 : 0;
|
||||||
|
if (facing.getAxis() == Axis.X) {
|
||||||
|
// offZ = -offZ;
|
||||||
|
rotY = -rotY;
|
||||||
|
}
|
||||||
|
|
||||||
|
float scale = !blockItem ? .25f : .5f;
|
||||||
|
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
|
GlStateManager.translated(position.x, position.y, position.z);
|
||||||
|
GlStateManager.scaled(scale, scale, scale);
|
||||||
|
GlStateManager.rotatef(rotZ, 0, 0, 1);
|
||||||
|
GlStateManager.rotatef(rotY, 0, 1, 0);
|
||||||
|
GlStateManager.rotatef(rotX, 1, 0, 0);
|
||||||
|
GlStateManager.translatef(offX, offY, offZ);
|
||||||
|
itemRenderer.renderItem(stack, TransformType.FIXED);
|
||||||
|
GlStateManager.popMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,56 +0,0 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.simibubi.create.foundation.block.ProperDirectionalBlock;
|
|
||||||
import com.simibubi.create.foundation.utility.ITooltip;
|
|
||||||
import com.simibubi.create.foundation.utility.ItemDescription;
|
|
||||||
import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
|
||||||
import com.simibubi.create.foundation.utility.TooltipHolder;
|
|
||||||
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.client.util.ITooltipFlag;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.util.text.ITextComponent;
|
|
||||||
import net.minecraft.world.IBlockReader;
|
|
||||||
|
|
||||||
public class StockpileSwitchBlock extends ProperDirectionalBlock implements ITooltip {
|
|
||||||
|
|
||||||
private TooltipHolder info;
|
|
||||||
|
|
||||||
public StockpileSwitchBlock() {
|
|
||||||
super(Properties.from(Blocks.ANDESITE));
|
|
||||||
info = new TooltipHolder(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addInformation(ItemStack stack, IBlockReader worldIn, List<ITextComponent> tooltip,
|
|
||||||
ITooltipFlag flagIn) {
|
|
||||||
info.addInformation(tooltip);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasTileEntity() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
|
||||||
return new StockpileSwitchTileEntity();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemDescription getDescription() {
|
|
||||||
Palette color = Palette.Yellow;
|
|
||||||
return new ItemDescription(color)
|
|
||||||
.withSummary("Toggles a Redstone signal based on the " + h("Storage Space", color)
|
|
||||||
+ " in the attached Container.")
|
|
||||||
.withBehaviour("When below Lower Limit", "Stops providing " + h("Redstone Power", color))
|
|
||||||
.withBehaviour("When above Upper Limit",
|
|
||||||
"Starts providing " + h("Redstone Power", color) + " until Lower Limit is reached again.")
|
|
||||||
.withControl("When R-Clicked", "Opens the " + h("Configuration Screen", color)).createTabs();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,5 +0,0 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
|
||||||
|
|
||||||
public class StockpileSwitchScreen {
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
package com.simibubi.create.modules.logistics;
|
|
||||||
|
|
||||||
import com.simibubi.create.AllTileEntities;
|
|
||||||
import com.simibubi.create.foundation.block.SyncedTileEntity;
|
|
||||||
|
|
||||||
import net.minecraft.nbt.CompoundNBT;
|
|
||||||
|
|
||||||
public class StockpileSwitchTileEntity extends SyncedTileEntity {
|
|
||||||
|
|
||||||
private float offWhenAbove;
|
|
||||||
private float onWhenBelow;
|
|
||||||
// private float currentLevel;
|
|
||||||
|
|
||||||
public StockpileSwitchTileEntity() {
|
|
||||||
super(AllTileEntities.STOCKPILE_SWITCH.type);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void read(CompoundNBT compound) {
|
|
||||||
|
|
||||||
offWhenAbove = compound.getFloat("OffAbove");
|
|
||||||
onWhenBelow = compound.getFloat("OnBelow");
|
|
||||||
updateCurrentLevel();
|
|
||||||
|
|
||||||
super.read(compound);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompoundNBT write(CompoundNBT compound) {
|
|
||||||
|
|
||||||
compound.putFloat("OffAbove", offWhenAbove);
|
|
||||||
compound.putFloat("OnBelow", onWhenBelow);
|
|
||||||
|
|
||||||
return super.write(compound);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateCurrentLevel() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenOpener;
|
||||||
|
import com.simibubi.create.foundation.utility.ITooltip;
|
||||||
|
import com.simibubi.create.foundation.utility.ItemDescription;
|
||||||
|
import com.simibubi.create.foundation.utility.ItemDescription.Palette;
|
||||||
|
import com.simibubi.create.foundation.utility.TooltipHolder;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.block.HorizontalBlock;
|
||||||
|
import net.minecraft.client.util.ITooltipFlag;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.item.BlockItemUseContext;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.state.IntegerProperty;
|
||||||
|
import net.minecraft.state.StateContainer.Builder;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.BlockRayTraceResult;
|
||||||
|
import net.minecraft.util.text.ITextComponent;
|
||||||
|
import net.minecraft.world.IBlockReader;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
|
|
||||||
|
public class StockswitchBlock extends HorizontalBlock implements ITooltip {
|
||||||
|
|
||||||
|
public static final IntegerProperty INDICATOR = IntegerProperty.create("indicator", 0, 6);
|
||||||
|
private TooltipHolder info;
|
||||||
|
|
||||||
|
public StockswitchBlock() {
|
||||||
|
super(Properties.from(Blocks.ANDESITE));
|
||||||
|
info = new TooltipHolder(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSolid(BlockState state) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addInformation(ItemStack stack, IBlockReader worldIn, List<ITextComponent> tooltip,
|
||||||
|
ITooltipFlag flagIn) {
|
||||||
|
info.addInformation(tooltip);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void fillStateContainer(Builder<Block, BlockState> builder) {
|
||||||
|
builder.add(HORIZONTAL_FACING, INDICATOR);
|
||||||
|
super.fillStateContainer(builder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn,
|
||||||
|
BlockRayTraceResult hit) {
|
||||||
|
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
|
||||||
|
displayScreen((StockswitchTileEntity) worldIn.getTileEntity(pos));
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnlyIn(value = Dist.CLIENT)
|
||||||
|
protected void displayScreen(StockswitchTileEntity te) {
|
||||||
|
ScreenOpener.open(new StockswitchScreen(te));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||||
|
BlockState state = getDefaultState();
|
||||||
|
|
||||||
|
if (context.getFace().getAxis().isHorizontal()) {
|
||||||
|
state = state.with(HORIZONTAL_FACING, context.getFace().getOpposite());
|
||||||
|
} else {
|
||||||
|
state = state.with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing());
|
||||||
|
}
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasTileEntity(BlockState state) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
||||||
|
return new StockswitchTileEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemDescription getDescription() {
|
||||||
|
Palette color = Palette.Yellow;
|
||||||
|
return new ItemDescription(color)
|
||||||
|
.withSummary("Toggles a Redstone signal based on the " + h("Storage Space", color)
|
||||||
|
+ " in the attached Container.")
|
||||||
|
.withBehaviour("When below Lower Limit", "Stops providing " + h("Redstone Power", color))
|
||||||
|
.withBehaviour("When above Upper Limit",
|
||||||
|
"Starts providing " + h("Redstone Power", color) + " until Lower Limit is reached again.")
|
||||||
|
.withControl("When R-Clicked", "Opens the " + h("Configuration Screen", color)).createTabs();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,104 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.STOCKSWITCH;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.simibubi.create.AllBlocks;
|
||||||
|
import com.simibubi.create.foundation.gui.AbstractSimiScreen;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenElementRenderer;
|
||||||
|
import com.simibubi.create.foundation.gui.ScreenResources;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.Label;
|
||||||
|
import com.simibubi.create.foundation.gui.widgets.ScrollInput;
|
||||||
|
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
|
||||||
|
public class StockswitchScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
|
private ScrollInput offBelow;
|
||||||
|
private Label offBelowLabel;
|
||||||
|
private ScrollInput onAbove;
|
||||||
|
private Label onAboveLabel;
|
||||||
|
|
||||||
|
private StockswitchTileEntity te;
|
||||||
|
|
||||||
|
public StockswitchScreen(StockswitchTileEntity te) {
|
||||||
|
this.te = te;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
setWindowSize(STOCKSWITCH.width + 50, STOCKSWITCH.height);
|
||||||
|
super.init();
|
||||||
|
widgets.clear();
|
||||||
|
|
||||||
|
offBelowLabel = new Label(guiLeft + 116, guiTop + 72, "").colored(0xD3CBBE).withShadow();
|
||||||
|
offBelow = new ScrollInput(guiLeft + 113, guiTop + 69, 33, 14).withRange(0, 96).titled("Lower Threshold")
|
||||||
|
.calling(state -> {
|
||||||
|
offBelowLabel.text = state + "%";
|
||||||
|
if (onAbove.getState() - 4 <= state) {
|
||||||
|
onAbove.setState(state + 5);
|
||||||
|
onAbove.onChanged();
|
||||||
|
}
|
||||||
|
}).setState((int) (te.offWhenBelow * 100));
|
||||||
|
|
||||||
|
onAboveLabel = new Label(guiLeft + 116, guiTop + 55, "").colored(0xD3CBBE).withShadow();
|
||||||
|
onAbove = new ScrollInput(guiLeft + 113, guiTop + 52, 33, 14).withRange(5, 101).titled("Upper Threshold")
|
||||||
|
.calling(state -> {
|
||||||
|
onAboveLabel.text = state + "%";
|
||||||
|
if (offBelow.getState() + 4 >= state) {
|
||||||
|
offBelow.setState(state - 5);
|
||||||
|
offBelow.onChanged();
|
||||||
|
}
|
||||||
|
}).setState((int) (te.onWhenAbove * 100));
|
||||||
|
|
||||||
|
onAbove.onChanged();
|
||||||
|
offBelow.onChanged();
|
||||||
|
widgets.addAll(Arrays.asList(offBelowLabel, offBelow, onAbove, onAboveLabel));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
|
int hFontColor = 0xD3CBBE;
|
||||||
|
int fontColor = 0x4B3A22;
|
||||||
|
STOCKSWITCH.draw(this, guiLeft, guiTop);
|
||||||
|
font.drawStringWithShadow("Stockpile Switch",
|
||||||
|
guiLeft - 3 + (STOCKSWITCH.width - font.getStringWidth("Stockpile Switch")) / 2, guiTop + 10,
|
||||||
|
hFontColor);
|
||||||
|
font.drawString("Start Signal " + (onAbove.getState() == 100 ? "at" : "above"), guiLeft + 13, guiTop + 55,
|
||||||
|
fontColor);
|
||||||
|
font.drawString("Stop Signal " + (offBelow.getState() == 0 ? "at" : "below"), guiLeft + 13, guiTop + 72,
|
||||||
|
fontColor);
|
||||||
|
|
||||||
|
ScreenResources sprite = ScreenResources.STOCKSWITCH_INTERVAL;
|
||||||
|
float lowerBound = offBelow.getState() / 100f * (sprite.width - 20) + 10;
|
||||||
|
float upperBound = onAbove.getState() / 100f * (sprite.width - 20) + 10;
|
||||||
|
float cursorPos = te.currentLevel * (sprite.width - 20) + 10;
|
||||||
|
|
||||||
|
sprite.bind();
|
||||||
|
blit((int) (guiLeft + lowerBound), guiTop + 26, (int) (sprite.startX + lowerBound), sprite.startY,
|
||||||
|
(int) (upperBound - lowerBound), sprite.height);
|
||||||
|
|
||||||
|
sprite = ScreenResources.STOCKSWITCH_INTERVAL_END;
|
||||||
|
sprite.bind();
|
||||||
|
blit((int) (guiLeft + upperBound), guiTop + 26, (int) (sprite.startX + upperBound), sprite.startY,
|
||||||
|
(int) (sprite.width - upperBound), sprite.height);
|
||||||
|
|
||||||
|
ScreenResources.STOCKSWITCH_BOUND_LEFT.draw(this, (int) (guiLeft + lowerBound) - 1, guiTop + 24);
|
||||||
|
ScreenResources.STOCKSWITCH_BOUND_RIGHT.draw(this, (int) (guiLeft + upperBound) - 5, guiTop + 24);
|
||||||
|
|
||||||
|
ScreenResources cursor = te.getWorld().isBlockPowered(te.getPos()) ? ScreenResources.STOCKSWITCH_CURSOR_ON
|
||||||
|
: ScreenResources.STOCKSWITCH_CURSOR_OFF;
|
||||||
|
cursor.draw(this, (int) (guiLeft + cursorPos), guiTop + 24);
|
||||||
|
|
||||||
|
ScreenElementRenderer.renderBlock(this::getRenderedBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState getRenderedBlock() {
|
||||||
|
GlStateManager.translated(guiLeft + STOCKSWITCH.width + 50, guiTop + 100, 0);
|
||||||
|
GlStateManager.rotatef(50, -.5f, 1, -.2f);
|
||||||
|
return AllBlocks.STOCKSWITCH.get().getDefaultState();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,48 @@
|
||||||
|
package com.simibubi.create.modules.logistics;
|
||||||
|
|
||||||
|
import com.simibubi.create.AllTileEntities;
|
||||||
|
import com.simibubi.create.foundation.block.SyncedTileEntity;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.CompoundNBT;
|
||||||
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
|
|
||||||
|
public class StockswitchTileEntity extends SyncedTileEntity {
|
||||||
|
|
||||||
|
float onWhenAbove;
|
||||||
|
float offWhenBelow;
|
||||||
|
float currentLevel;
|
||||||
|
|
||||||
|
public StockswitchTileEntity() {
|
||||||
|
this(AllTileEntities.STOCKSWITCH.type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StockswitchTileEntity(TileEntityType<?> typeIn) {
|
||||||
|
super(typeIn);
|
||||||
|
onWhenAbove = .75f;
|
||||||
|
offWhenBelow = .25f;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void read(CompoundNBT compound) {
|
||||||
|
|
||||||
|
onWhenAbove = compound.getFloat("OnAbove");
|
||||||
|
offWhenBelow = compound.getFloat("OffBelow");
|
||||||
|
updateCurrentLevel();
|
||||||
|
|
||||||
|
super.read(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundNBT write(CompoundNBT compound) {
|
||||||
|
|
||||||
|
compound.putFloat("OnAbove", onWhenAbove);
|
||||||
|
compound.putFloat("OffBelow", offWhenBelow);
|
||||||
|
|
||||||
|
return super.write(compound);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateCurrentLevel() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,5 +1,8 @@
|
||||||
package com.simibubi.create.modules.schematics.block;
|
package com.simibubi.create.modules.schematics.block;
|
||||||
|
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.SCHEMATIC_TABLE;
|
||||||
|
import static com.simibubi.create.foundation.gui.ScreenResources.SCHEMATIC_TABLE_PROGRESS;
|
||||||
|
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -42,10 +45,10 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
setWindowSize(ScreenResources.SCHEMATIC_TABLE.width, ScreenResources.SCHEMATIC_TABLE.height + 50);
|
setWindowSize(SCHEMATIC_TABLE.width, SCHEMATIC_TABLE.height + 50);
|
||||||
super.init();
|
super.init();
|
||||||
widgets.clear();
|
widgets.clear();
|
||||||
|
|
||||||
int mainLeft = guiLeft - 56;
|
int mainLeft = guiLeft - 56;
|
||||||
int mainTop = guiTop - 16;
|
int mainTop = guiTop - 16;
|
||||||
|
|
||||||
|
@ -55,11 +58,11 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
schematicsLabel = new Label(mainLeft + 36, mainTop + 26, "").withShadow();
|
schematicsLabel = new Label(mainLeft + 36, mainTop + 26, "").withShadow();
|
||||||
schematicsLabel.text = "";
|
schematicsLabel.text = "";
|
||||||
if (!availableSchematics.isEmpty()) {
|
if (!availableSchematics.isEmpty()) {
|
||||||
schematicsArea = new SelectionScrollInput(mainLeft + 33, mainTop + 23, 134, 14).forOptions(availableSchematics)
|
schematicsArea = new SelectionScrollInput(mainLeft + 33, mainTop + 23, 134, 14)
|
||||||
.titled("Available Schematics").writingTo(schematicsLabel);
|
.forOptions(availableSchematics).titled("Available Schematics").writingTo(schematicsLabel);
|
||||||
widgets.add(schematicsArea);
|
widgets.add(schematicsArea);
|
||||||
widgets.add(schematicsLabel);
|
widgets.add(schematicsLabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
confirmButton = new IconButton(mainLeft + 69, mainTop + 55, ScreenResources.ICON_CONFIRM);
|
confirmButton = new IconButton(mainLeft + 69, mainTop + 55, ScreenResources.ICON_CONFIRM);
|
||||||
folderButton = new IconButton(mainLeft + 204, mainTop + 6, ScreenResources.ICON_OPEN_FOLDER);
|
folderButton = new IconButton(mainLeft + 204, mainTop + 6, ScreenResources.ICON_OPEN_FOLDER);
|
||||||
|
@ -72,23 +75,22 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
||||||
super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
|
super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
|
|
||||||
int x = guiLeft + 20;
|
int x = guiLeft + 20;
|
||||||
int y = guiTop;
|
int y = guiTop;
|
||||||
|
|
||||||
int mainLeft = guiLeft - 56;
|
int mainLeft = guiLeft - 56;
|
||||||
int mainTop = guiTop - 16;
|
int mainTop = guiTop - 16;
|
||||||
|
|
||||||
ScreenResources.PLAYER_INVENTORY.draw(this, x- 16, y + 70 + 14);
|
ScreenResources.PLAYER_INVENTORY.draw(this, x - 16, y + 70 + 14);
|
||||||
font.drawString("Inventory", x - 15 + 7, y + 64 + 26, 0x666666);
|
font.drawString("Inventory", x - 15 + 7, y + 64 + 26, 0x666666);
|
||||||
|
|
||||||
ScreenResources.SCHEMATIC_TABLE.draw(this, mainLeft, mainTop);
|
SCHEMATIC_TABLE.draw(this, mainLeft, mainTop);
|
||||||
if (container.getTileEntity().isUploading)
|
if (container.getTileEntity().isUploading)
|
||||||
font.drawString("Uploading...", mainLeft + 76, mainTop + 10, ScreenResources.FONT_COLOR);
|
font.drawString("Uploading...", mainLeft + 76, mainTop + 10, ScreenResources.FONT_COLOR);
|
||||||
else if (container.getSlot(1).getHasStack())
|
else if (container.getSlot(1).getHasStack())
|
||||||
|
@ -99,14 +101,14 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
if (schematicsArea == null) {
|
if (schematicsArea == null) {
|
||||||
font.drawStringWithShadow(" No Schematics Saved ", mainLeft + 39, mainTop + 26, 0xFFDD44);
|
font.drawStringWithShadow(" No Schematics Saved ", mainLeft + 39, mainTop + 26, 0xFFDD44);
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft.getTextureManager().bindTexture(ScreenResources.SCHEMATIC_TABLE_PROGRESS.location);
|
minecraft.getTextureManager().bindTexture(SCHEMATIC_TABLE_PROGRESS.location);
|
||||||
int width = (int) (ScreenResources.SCHEMATIC_TABLE_PROGRESS.width
|
int width = (int) (SCHEMATIC_TABLE_PROGRESS.width
|
||||||
* MathHelper.lerp(partialTicks, lastChasingProgress, chasingProgress));
|
* MathHelper.lerp(partialTicks, lastChasingProgress, chasingProgress));
|
||||||
int height = ScreenResources.SCHEMATIC_TABLE_PROGRESS.height;
|
int height = SCHEMATIC_TABLE_PROGRESS.height;
|
||||||
GlStateManager.disableLighting();
|
GlStateManager.disableLighting();
|
||||||
blit(mainLeft + 94, mainTop + 56, ScreenResources.SCHEMATIC_TABLE_PROGRESS.startX,
|
blit(mainLeft + 94, mainTop + 56, SCHEMATIC_TABLE_PROGRESS.startX, SCHEMATIC_TABLE_PROGRESS.startY, width,
|
||||||
ScreenResources.SCHEMATIC_TABLE_PROGRESS.startY, width, height);
|
height);
|
||||||
|
|
||||||
GlStateManager.pushMatrix();
|
GlStateManager.pushMatrix();
|
||||||
|
|
||||||
|
@ -146,7 +148,7 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
chasingProgress += (progress - chasingProgress) * .5f;
|
chasingProgress += (progress - chasingProgress) * .5f;
|
||||||
}
|
}
|
||||||
confirmButton.active = false;
|
confirmButton.active = false;
|
||||||
|
|
||||||
if (schematicsLabel != null) {
|
if (schematicsLabel != null) {
|
||||||
schematicsLabel.colored(0xCCDDFF);
|
schematicsLabel.colored(0xCCDDFF);
|
||||||
schematicsLabel.text = container.getTileEntity().uploadingSchematic;
|
schematicsLabel.text = container.getTileEntity().uploadingSchematic;
|
||||||
|
@ -158,7 +160,7 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
progress = 0;
|
progress = 0;
|
||||||
chasingProgress = lastChasingProgress = 0;
|
chasingProgress = lastChasingProgress = 0;
|
||||||
confirmButton.active = true;
|
confirmButton.active = true;
|
||||||
|
|
||||||
if (schematicsLabel != null)
|
if (schematicsLabel != null)
|
||||||
schematicsLabel.colored(0xFFFFFF);
|
schematicsLabel.colored(0xFFFFFF);
|
||||||
if (schematicsArea != null) {
|
if (schematicsArea != null) {
|
||||||
|
@ -178,19 +180,19 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen<SchematicT
|
||||||
String schematic = availableSchematics.get(schematicsArea.getState());
|
String schematic = availableSchematics.get(schematicsArea.getState());
|
||||||
Create.cSchematicLoader.startNewUpload(schematic);
|
Create.cSchematicLoader.startNewUpload(schematic);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (folderButton.isHovered()) {
|
if (folderButton.isHovered()) {
|
||||||
Util.getOSType().openFile(Paths.get("schematics/").toFile());
|
Util.getOSType().openFile(Paths.get("schematics/").toFile());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (refreshButton.isHovered()) {
|
if (refreshButton.isHovered()) {
|
||||||
Create.cSchematicLoader.refresh();
|
Create.cSchematicLoader.refresh();
|
||||||
List<String> availableSchematics = Create.cSchematicLoader.getAvailableSchematics();
|
List<String> availableSchematics = Create.cSchematicLoader.getAvailableSchematics();
|
||||||
widgets.remove(schematicsArea);
|
widgets.remove(schematicsArea);
|
||||||
|
|
||||||
if (!availableSchematics.isEmpty()) {
|
if (!availableSchematics.isEmpty()) {
|
||||||
schematicsArea = new SelectionScrollInput(guiLeft - 56 + 33, guiTop - 16 + 23, 134, 14).forOptions(availableSchematics)
|
schematicsArea = new SelectionScrollInput(guiLeft - 56 + 33, guiTop - 16 + 23, 134, 14)
|
||||||
.titled("Available Schematics").writingTo(schematicsLabel);
|
.forOptions(availableSchematics).titled("Available Schematics").writingTo(schematicsLabel);
|
||||||
widgets.add(schematicsArea);
|
widgets.add(schematicsArea);
|
||||||
} else {
|
} else {
|
||||||
schematicsArea = null;
|
schematicsArea = null;
|
||||||
|
|
|
@ -96,7 +96,7 @@ public class SchematicannonBlock extends InfoBlock {
|
||||||
public ItemDescription getDescription() {
|
public ItemDescription getDescription() {
|
||||||
Palette color = Palette.Blue;
|
Palette color = Palette.Blue;
|
||||||
return new ItemDescription(color).withSummary("Prints a deployed " + h("Schematic", color)
|
return new ItemDescription(color).withSummary("Prints a deployed " + h("Schematic", color)
|
||||||
+ "into the world using blocks from inventories placed right next to it.");
|
+ " into the world using blocks from inventories placed right next to it.").createTabs();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,8 +34,8 @@ public class BlueprintEditScreen extends AbstractSimiScreen {
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
setWindowSize(ScreenResources.SCHEMATIC.width + 50, ScreenResources.SCHEMATIC.height);
|
setWindowSize(ScreenResources.SCHEMATIC.width + 50, ScreenResources.SCHEMATIC.height);
|
||||||
int x = topLeftX;
|
int x = guiLeft;
|
||||||
int y = topLeftY;
|
int y = guiTop;
|
||||||
BlueprintHandler bh = BlueprintHandler.instance;
|
BlueprintHandler bh = BlueprintHandler.instance;
|
||||||
|
|
||||||
xInput = new TextFieldWidget(font, x + 75, y + 32, 32, 10, "");
|
xInput = new TextFieldWidget(font, x + 75, y + 32, 32, 10, "");
|
||||||
|
@ -117,8 +117,8 @@ public class BlueprintEditScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
int x = topLeftX;
|
int x = guiLeft;
|
||||||
int y = topLeftY;
|
int y = guiTop;
|
||||||
ScreenResources.SCHEMATIC.draw(this, x, y);
|
ScreenResources.SCHEMATIC.draw(this, x, y);
|
||||||
BlueprintHandler bh = BlueprintHandler.instance;
|
BlueprintHandler bh = BlueprintHandler.instance;
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ public class BlueprintEditScreen extends AbstractSimiScreen {
|
||||||
font.drawString("Mirror", x + 10, y + 72, ScreenResources.FONT_COLOR);
|
font.drawString("Mirror", x + 10, y + 72, ScreenResources.FONT_COLOR);
|
||||||
|
|
||||||
GlStateManager.pushMatrix();
|
GlStateManager.pushMatrix();
|
||||||
GlStateManager.translated(topLeftX + 220, topLeftY + 20, 0);
|
GlStateManager.translated(guiLeft + 220, guiTop + 20, 0);
|
||||||
GlStateManager.scaled(3, 3, 3);
|
GlStateManager.scaled(3, 3, 3);
|
||||||
itemRenderer.renderItemIntoGUI(new ItemStack(AllItems.BLUEPRINT.get()), 0, 0);
|
itemRenderer.renderItemIntoGUI(new ItemStack(AllItems.BLUEPRINT.get()), 0, 0);
|
||||||
GlStateManager.popMatrix();
|
GlStateManager.popMatrix();
|
||||||
|
|
|
@ -56,12 +56,12 @@ public class SymmetryWandScreen extends AbstractSimiScreen {
|
||||||
super.init();
|
super.init();
|
||||||
this.setWindowSize(ScreenResources.WAND_SYMMETRY.width + 50, ScreenResources.WAND_SYMMETRY.height + 50);
|
this.setWindowSize(ScreenResources.WAND_SYMMETRY.width + 50, ScreenResources.WAND_SYMMETRY.height + 50);
|
||||||
|
|
||||||
labelType = new Label(topLeftX + 122, topLeftY + 15, "").colored(0xFFFFFFFF).withShadow();
|
labelType = new Label(guiLeft + 122, guiTop + 15, "").colored(0xFFFFFFFF).withShadow();
|
||||||
labelAlign = new Label(topLeftX + 122, topLeftY + 35, "").colored(0xFFFFFFFF).withShadow();
|
labelAlign = new Label(guiLeft + 122, guiTop + 35, "").colored(0xFFFFFFFF).withShadow();
|
||||||
|
|
||||||
int state = currentElement instanceof TriplePlaneMirror ? 2
|
int state = currentElement instanceof TriplePlaneMirror ? 2
|
||||||
: currentElement instanceof CrossPlaneMirror ? 1 : 0;
|
: currentElement instanceof CrossPlaneMirror ? 1 : 0;
|
||||||
areaType = new SelectionScrollInput(topLeftX + 119, topLeftY + 12, 70, 14)
|
areaType = new SelectionScrollInput(guiLeft + 119, guiTop + 12, 70, 14)
|
||||||
.forOptions(SymmetryMirror.TOOLTIP_ELEMENTS).titled("Type of Mirror").writingTo(labelType)
|
.forOptions(SymmetryMirror.TOOLTIP_ELEMENTS).titled("Type of Mirror").writingTo(labelType)
|
||||||
.setState(state);
|
.setState(state);
|
||||||
|
|
||||||
|
@ -97,7 +97,7 @@ public class SymmetryWandScreen extends AbstractSimiScreen {
|
||||||
widgets.remove(areaAlign);
|
widgets.remove(areaAlign);
|
||||||
}
|
}
|
||||||
|
|
||||||
areaAlign = new SelectionScrollInput(topLeftX + 119, topLeftY + 32, 70, 14).forOptions(element.getAlignToolTips())
|
areaAlign = new SelectionScrollInput(guiLeft + 119, guiTop + 32, 70, 14).forOptions(element.getAlignToolTips())
|
||||||
.titled("Direction").writingTo(labelAlign).setState(element.getOrientationIndex())
|
.titled("Direction").writingTo(labelAlign).setState(element.getOrientationIndex())
|
||||||
.calling(element::setOrientation);
|
.calling(element::setOrientation);
|
||||||
|
|
||||||
|
@ -112,10 +112,10 @@ public class SymmetryWandScreen extends AbstractSimiScreen {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
protected void renderWindow(int mouseX, int mouseY, float partialTicks) {
|
||||||
ScreenResources.WAND_SYMMETRY.draw(this, topLeftX, topLeftY);
|
ScreenResources.WAND_SYMMETRY.draw(this, guiLeft, guiTop);
|
||||||
|
|
||||||
int x = topLeftX + 63;
|
int x = guiLeft + 63;
|
||||||
int y = topLeftY + 15;
|
int y = guiTop + 15;
|
||||||
|
|
||||||
font.drawString("Symmetry", x, y, ScreenResources.FONT_COLOR);
|
font.drawString("Symmetry", x, y, ScreenResources.FONT_COLOR);
|
||||||
font.drawString("Direction", x, y + 20, ScreenResources.FONT_COLOR);
|
font.drawString("Direction", x, y + 20, ScreenResources.FONT_COLOR);
|
||||||
|
@ -155,7 +155,7 @@ public class SymmetryWandScreen extends AbstractSimiScreen {
|
||||||
GlStateManager.pushMatrix();
|
GlStateManager.pushMatrix();
|
||||||
BufferBuilder buffer = Tessellator.getInstance().getBuffer();
|
BufferBuilder buffer = Tessellator.getInstance().getBuffer();
|
||||||
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK);
|
buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK);
|
||||||
GlStateManager.translated(topLeftX + 15, topLeftY - 117, 20);
|
GlStateManager.translated(guiLeft + 15, guiTop - 117, 20);
|
||||||
GlStateManager.rotatef(-22.5f, .3f, 1f, 0f);
|
GlStateManager.rotatef(-22.5f, .3f, 1f, 0f);
|
||||||
GlStateManager.scaled(32, -32, 32);
|
GlStateManager.scaled(32, -32, 32);
|
||||||
minecraft.getBlockRendererDispatcher().renderBlock(currentElement.getModel(), new BlockPos(0, -5, 0),
|
minecraft.getBlockRendererDispatcher().renderBlock(currentElement.getModel(), new BlockPos(0, -5, 0),
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"": { "model": "create:block/flex_crate" }
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,17 +1,31 @@
|
||||||
{
|
{
|
||||||
"variants": {
|
"variants": {
|
||||||
"powered=false,facing=up": { "model": "create:block/redstone_bridge" },
|
"receiver=false,powered=false,facing=up": { "model": "create:block/redstone_bridge", "y": 180 },
|
||||||
"powered=false,facing=down": { "model": "create:block/redstone_bridge", "x": 180 },
|
"receiver=false,powered=false,facing=down": { "model": "create:block/redstone_bridge", "x": 180, "y": 180 },
|
||||||
"powered=false,facing=south": { "model": "create:block/redstone_bridge_side"},
|
"receiver=false,powered=false,facing=south": { "model": "create:block/redstone_bridge_side", "x": 270 },
|
||||||
"powered=false,facing=north": { "model": "create:block/redstone_bridge_side", "y": 180 },
|
"receiver=false,powered=false,facing=north": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 180 },
|
||||||
"powered=false,facing=west": { "model": "create:block/redstone_bridge_side", "y": 90 },
|
"receiver=false,powered=false,facing=west": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 90 },
|
||||||
"powered=false,facing=east": { "model": "create:block/redstone_bridge_side", "y": 270 },
|
"receiver=false,powered=false,facing=east": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 270 },
|
||||||
|
|
||||||
"powered=true,facing=up": { "model": "create:block/redstone_bridge_powered" },
|
"receiver=false,powered=true,facing=up": { "model": "create:block/redstone_bridge_powered", "y": 180 },
|
||||||
"powered=true,facing=down": { "model": "create:block/redstone_bridge_powered", "x": 180 },
|
"receiver=false,powered=true,facing=down": { "model": "create:block/redstone_bridge_powered", "x": 180, "y": 180 },
|
||||||
"powered=true,facing=south": { "model": "create:block/redstone_bridge_side_powered"},
|
"receiver=false,powered=true,facing=south": { "model": "create:block/redstone_bridge_side_powered", "x": 270 },
|
||||||
"powered=true,facing=north": { "model": "create:block/redstone_bridge_side_powered", "y": 180 },
|
"receiver=false,powered=true,facing=north": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 180 },
|
||||||
"powered=true,facing=west": { "model": "create:block/redstone_bridge_side_powered", "y": 90 },
|
"receiver=false,powered=true,facing=west": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 90 },
|
||||||
"powered=true,facing=east": { "model": "create:block/redstone_bridge_side_powered", "y": 270 }
|
"receiver=false,powered=true,facing=east": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 270 },
|
||||||
|
|
||||||
|
"receiver=true,powered=false,facing=up": { "model": "create:block/redstone_bridge_receiver", "y": 180 },
|
||||||
|
"receiver=true,powered=false,facing=down": { "model": "create:block/redstone_bridge_receiver", "x": 180, "y": 180 },
|
||||||
|
"receiver=true,powered=false,facing=south": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 },
|
||||||
|
"receiver=true,powered=false,facing=north": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 180 },
|
||||||
|
"receiver=true,powered=false,facing=west": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 90 },
|
||||||
|
"receiver=true,powered=false,facing=east": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 270 },
|
||||||
|
|
||||||
|
"receiver=true,powered=true,facing=up": { "model": "create:block/redstone_bridge_receiver_powered", "y": 180 },
|
||||||
|
"receiver=true,powered=true,facing=down": { "model": "create:block/redstone_bridge_receiver_powered", "x": 180, "y": 180 },
|
||||||
|
"receiver=true,powered=true,facing=south": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 },
|
||||||
|
"receiver=true,powered=true,facing=north": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 180 },
|
||||||
|
"receiver=true,powered=true,facing=west": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 90 },
|
||||||
|
"receiver=true,powered=true,facing=east": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 270 }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"forge_marker": 1,
|
||||||
|
"defaults": {
|
||||||
|
"model": "create:block/stockpile_switch"
|
||||||
|
},
|
||||||
|
"variants": {
|
||||||
|
"indicator": {
|
||||||
|
"0": { "model": "create:block/stockpile_switch" },
|
||||||
|
"1": { "model": "create:block/stockpile_switch_1" },
|
||||||
|
"2": { "model": "create:block/stockpile_switch_2" },
|
||||||
|
"3": { "model": "create:block/stockpile_switch_3" },
|
||||||
|
"4": { "model": "create:block/stockpile_switch_4" },
|
||||||
|
"5": { "model": "create:block/stockpile_switch_5" },
|
||||||
|
"6": { "model": "create:block/stockpile_switch_6" }
|
||||||
|
},
|
||||||
|
"facing": {
|
||||||
|
"south": { "y": 270 },
|
||||||
|
"east": { "y": 180 },
|
||||||
|
"north": { "y": 90 },
|
||||||
|
"west": { "y": 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -35,8 +35,8 @@
|
||||||
|
|
||||||
"block.create.contact": "Redstone Contact",
|
"block.create.contact": "Redstone Contact",
|
||||||
"block.create.redstone_bridge": "Redstone Bridge",
|
"block.create.redstone_bridge": "Redstone Bridge",
|
||||||
"block.create.stockpile_switch": "Stockpile Switch",
|
"block.create.stockswitch": "Stockpile Switch",
|
||||||
"block.create.flex_crate": "FlexCrate",
|
"block.create.flexcrate": "FlexCrate",
|
||||||
|
|
||||||
"block.create.andesite_bricks": "Andesite Bricks",
|
"block.create.andesite_bricks": "Andesite Bricks",
|
||||||
"block.create.diorite_bricks": "Diorite Bricks",
|
"block.create.diorite_bricks": "Diorite Bricks",
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"particle": "create:block/flex_crate",
|
||||||
|
"flex_crate": "create:block/flex_crate"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Crate",
|
||||||
|
"from": [ 1, 0, 1 ],
|
||||||
|
"to": [ 15, 14, 15 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] },
|
||||||
|
"east": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] },
|
||||||
|
"south": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] },
|
||||||
|
"west": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] },
|
||||||
|
"up": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] },
|
||||||
|
"down": { "texture": "#flex_crate", "uv": [ 1, 1, 15, 15 ] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -11,7 +11,7 @@
|
||||||
"textures": {
|
"textures": {
|
||||||
"redstone_antenna": "create:block/redstone_antenna",
|
"redstone_antenna": "create:block/redstone_antenna",
|
||||||
"redstone_bridge": "create:block/redstone_bridge",
|
"redstone_bridge": "create:block/redstone_bridge",
|
||||||
"particle": "#redstone_bridge"
|
"particle": "create:block/redstone_bridge"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
"parent": "create:block/redstone_bridge",
|
"parent": "create:block/redstone_bridge",
|
||||||
"textures": {
|
"textures": {
|
||||||
"redstone_antenna": "create:block/redstone_antenna_powered",
|
"redstone_antenna": "create:block/redstone_antenna_powered",
|
||||||
"redstone_bridge": "create:block/redstone_bridge_powered"
|
"redstone_bridge": "create:block/redstone_bridge_powered",
|
||||||
|
"particle": "create:block/redstone_bridge_powered"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,66 @@
|
||||||
|
{
|
||||||
|
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
|
||||||
|
"parent": "block/block",
|
||||||
|
"display": {
|
||||||
|
"gui": {
|
||||||
|
"rotation": [ 30, 45, 0 ],
|
||||||
|
"translation": [ 0, 0, 0],
|
||||||
|
"scale":[ 0.625, 0.625, 0.625 ]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"textures": {
|
||||||
|
"redstone_antenna": "create:block/redstone_antenna",
|
||||||
|
"redstone_bridge": "create:block/redstone_bridge",
|
||||||
|
"particle": "create:block/redstone_bridge"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Controller",
|
||||||
|
"from": [ 2, 0, 2 ],
|
||||||
|
"to": [ 14, 3, 14 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_bridge", "uv": [ 12, 0, 15, 12 ], "rotation": 90 },
|
||||||
|
"east": { "texture": "#redstone_bridge", "uv": [ 0, 12, 12, 15 ] },
|
||||||
|
"south": { "texture": "#redstone_bridge", "uv": [ 12, 0, 15, 12 ], "rotation": 90 },
|
||||||
|
"west": { "texture": "#redstone_bridge", "uv": [ 0, 12, 12, 15 ] },
|
||||||
|
"up": { "texture": "#redstone_bridge", "uv": [ 0, 0, 12, 12 ], "rotation": 270 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaX",
|
||||||
|
"from": [ 0, 1, 4 ],
|
||||||
|
"to": [ 3, 11, 5 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
||||||
|
"south": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
||||||
|
"down": { "texture": "#redstone_antenna", "uv": [ 0, 9, 3, 10 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaZ",
|
||||||
|
"from": [ 1, 1, 3 ],
|
||||||
|
"to": [ 2, 11, 6 ],
|
||||||
|
"faces": {
|
||||||
|
"east": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
||||||
|
"west": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaTop",
|
||||||
|
"from": [ 1, 9, 4 ],
|
||||||
|
"to": [ 2, 10, 5 ],
|
||||||
|
"faces": {
|
||||||
|
"up": { "texture": "#redstone_antenna", "uv": [ 1, 1, 2, 2 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Dish",
|
||||||
|
"from": [ -1, 7, 2 ],
|
||||||
|
"to": [ 4, 7, 7 ],
|
||||||
|
"faces": {
|
||||||
|
"up": { "texture": "#redstone_antenna", "uv": [ 4, 0, 9, 5 ] },
|
||||||
|
"down": { "texture": "#redstone_antenna", "uv": [ 4, 0, 9, 5 ] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/redstone_bridge_receiver",
|
||||||
|
"textures": {
|
||||||
|
"redstone_antenna": "create:block/redstone_antenna_powered",
|
||||||
|
"redstone_bridge": "create:block/redstone_bridge_powered",
|
||||||
|
"particle": "create:block/redstone_bridge_powered"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,70 @@
|
||||||
|
{
|
||||||
|
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"redstone_antenna": "create:block/redstone_antenna",
|
||||||
|
"redstone_bridge_side": "create:block/redstone_bridge_side",
|
||||||
|
"particle": "create:block/redstone_bridge_side"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Body",
|
||||||
|
"from": [ 3, 0, 1 ],
|
||||||
|
"to": [ 13, 3, 15 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_bridge_side", "uv": [ 13, 2, 16, 12 ], "rotation": 90 },
|
||||||
|
"east": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ], "rotation": 90 },
|
||||||
|
"south": { "texture": "#redstone_bridge_side", "uv": [ 13, 2, 16, 12 ], "rotation": 90 },
|
||||||
|
"west": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ], "rotation": 90 },
|
||||||
|
"up": { "texture": "#redstone_bridge_side", "uv": [ 0, 0, 10, 14 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bottom",
|
||||||
|
"from": [ 3, -1, 1 ],
|
||||||
|
"to": [ 13, 0, 15 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_bridge_side", "uv": [ 15, 1, 16, 13 ], "rotation": 270 },
|
||||||
|
"east": { "texture": "#redstone_bridge_side", "uv": [ 14, 0, 15, 14 ], "rotation": 270 },
|
||||||
|
"south": { "texture": "#redstone_bridge_side", "uv": [ 15, 1, 16, 13 ], "rotation": 90 },
|
||||||
|
"west": { "texture": "#redstone_bridge_side", "uv": [ 14, 0, 15, 14 ], "rotation": 90 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaX",
|
||||||
|
"from": [ 3, 3, -5 ],
|
||||||
|
"to": [ 6, 4, 5 ],
|
||||||
|
"faces": {
|
||||||
|
"south": { "texture": "#redstone_antenna", "uv": [ 0, 9, 3, 10 ] },
|
||||||
|
"up": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
||||||
|
"down": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 180 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaZ",
|
||||||
|
"from": [ 4, 2, -5 ],
|
||||||
|
"to": [ 5, 5, 5 ],
|
||||||
|
"faces": {
|
||||||
|
"east": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 90 },
|
||||||
|
"west": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 270 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "AntennaTop",
|
||||||
|
"from": [ 4, 3, -4 ],
|
||||||
|
"to": [ 5, 4, -3 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_antenna", "uv": [ 1, 1, 2, 2 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Dish",
|
||||||
|
"from": [ 2, 1, -1 ],
|
||||||
|
"to": [ 7, 6, -1 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_antenna", "uv": [ 4, 0, 9, 5 ] },
|
||||||
|
"south": { "texture": "#redstone_antenna", "uv": [ 4, 0, 9, 5 ] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/redstone_bridge_receiver_side",
|
||||||
|
"textures": {
|
||||||
|
"redstone_antenna": "create:block/redstone_antenna_powered",
|
||||||
|
"redstone_bridge_side": "create:block/redstone_bridge_side_powered",
|
||||||
|
"particle": "create:block/redstone_bridge_powered"
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,47 +4,57 @@
|
||||||
"textures": {
|
"textures": {
|
||||||
"redstone_antenna": "create:block/redstone_antenna",
|
"redstone_antenna": "create:block/redstone_antenna",
|
||||||
"redstone_bridge_side": "create:block/redstone_bridge_side",
|
"redstone_bridge_side": "create:block/redstone_bridge_side",
|
||||||
"particle": "#redstone_bridge_side"
|
"particle": "create:block/redstone_bridge_side"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
"name": "Controller",
|
"name": "Body",
|
||||||
"from": [ 3, 1, -1 ],
|
"from": [ 3, 0, 1 ],
|
||||||
"to": [ 13, 15, 2 ],
|
"to": [ 13, 3, 15 ],
|
||||||
"faces": {
|
"faces": {
|
||||||
"north": { "texture": "#redstone_bridge_side", "uv": [ 0, 0, 10, 14 ] },
|
"north": { "texture": "#redstone_bridge_side", "uv": [ 13, 2, 16, 12 ], "rotation": 90 },
|
||||||
"east": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ] },
|
"east": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ], "rotation": 90 },
|
||||||
"south": { "texture": "#redstone_bridge_side", "uv": [ 0, 0, 10, 14 ] },
|
"south": { "texture": "#redstone_bridge_side", "uv": [ 13, 2, 16, 12 ], "rotation": 90 },
|
||||||
"west": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ], "rotation": 180 },
|
"west": { "texture": "#redstone_bridge_side", "uv": [ 10, 0, 13, 14 ], "rotation": 90 },
|
||||||
"up": { "texture": "#redstone_bridge_side", "uv": [ 13, 0, 16, 10 ], "rotation": 270 },
|
"up": { "texture": "#redstone_bridge_side", "uv": [ 0, 0, 10, 14 ] }
|
||||||
"down": { "texture": "#redstone_bridge_side", "uv": [ 13, 0, 16, 10 ], "rotation": 90 }
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bottom",
|
||||||
|
"from": [ 3, -1, 1 ],
|
||||||
|
"to": [ 13, 0, 15 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#redstone_bridge_side", "uv": [ 15, 1, 16, 13 ], "rotation": 270 },
|
||||||
|
"east": { "texture": "#redstone_bridge_side", "uv": [ 14, 0, 15, 14 ], "rotation": 270 },
|
||||||
|
"south": { "texture": "#redstone_bridge_side", "uv": [ 15, 1, 16, 13 ], "rotation": 90 },
|
||||||
|
"west": { "texture": "#redstone_bridge_side", "uv": [ 14, 0, 15, 14 ], "rotation": 90 }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "AntennaX",
|
"name": "AntennaX",
|
||||||
"from": [ 3, 11, 2 ],
|
"from": [ 3, 3, -5 ],
|
||||||
"to": [ 6, 21, 3 ],
|
"to": [ 6, 4, 5 ],
|
||||||
"faces": {
|
"faces": {
|
||||||
"north": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
"south": { "texture": "#redstone_antenna", "uv": [ 0, 9, 3, 10 ] },
|
||||||
"south": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
"up": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
||||||
"down": { "texture": "#redstone_antenna", "uv": [ 0, 9, 3, 10 ] }
|
"down": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 180 }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "AntennaZ",
|
"name": "AntennaZ",
|
||||||
"from": [ 4, 11, 1 ],
|
"from": [ 4, 2, -5 ],
|
||||||
"to": [ 5, 21, 4 ],
|
"to": [ 5, 5, 5 ],
|
||||||
"faces": {
|
"faces": {
|
||||||
"east": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] },
|
"east": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 90 },
|
||||||
"west": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ] }
|
"west": { "texture": "#redstone_antenna", "uv": [ 0, 0, 3, 10 ], "rotation": 270 }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "AntennaTop",
|
"name": "AntennaTop",
|
||||||
"from": [ 4, 19, 2 ],
|
"from": [ 4, 3, -4 ],
|
||||||
"to": [ 5, 20, 3 ],
|
"to": [ 5, 4, -3 ],
|
||||||
"faces": {
|
"faces": {
|
||||||
"up": { "texture": "#redstone_antenna", "uv": [ 1, 1, 2, 2 ] }
|
"north": { "texture": "#redstone_antenna", "uv": [ 1, 1, 2, 2 ] }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
"parent": "create:block/redstone_bridge_side",
|
"parent": "create:block/redstone_bridge_side",
|
||||||
"textures": {
|
"textures": {
|
||||||
"redstone_antenna": "create:block/redstone_antenna_powered",
|
"redstone_antenna": "create:block/redstone_antenna_powered",
|
||||||
"redstone_bridge_side": "create:block/redstone_bridge_side_powered"
|
"redstone_bridge_side": "create:block/redstone_bridge_side_powered",
|
||||||
|
"particle": "create:block/redstone_bridge_powered"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,92 @@
|
||||||
|
{
|
||||||
|
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/0",
|
||||||
|
"brass_casing": "create:block/brass_casing",
|
||||||
|
"dark_oak_planks": "minecraft:block/dark_oak_planks",
|
||||||
|
"iron_block": "minecraft:block/iron_block",
|
||||||
|
"particle": "create:block/brass_casing"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Indicator",
|
||||||
|
"from": [ 1, 2, 13 ],
|
||||||
|
"to": [ 4, 14, 16 ],
|
||||||
|
"faces": {
|
||||||
|
"east": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] },
|
||||||
|
"south": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] },
|
||||||
|
"west": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bottom Plate",
|
||||||
|
"from": [ 0, 0, 0 ],
|
||||||
|
"to": [ 16, 2, 16 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] },
|
||||||
|
"east": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] },
|
||||||
|
"south": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] },
|
||||||
|
"west": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] },
|
||||||
|
"up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] },
|
||||||
|
"down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Top Plate",
|
||||||
|
"from": [ 0, 14, 0 ],
|
||||||
|
"to": [ 16, 16, 16 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] },
|
||||||
|
"east": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] },
|
||||||
|
"south": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] },
|
||||||
|
"west": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] },
|
||||||
|
"up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] },
|
||||||
|
"down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Side Plate",
|
||||||
|
"from": [ 14, 2, 0 ],
|
||||||
|
"to": [ 16, 14, 16 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#brass_casing", "uv": [ 0, 2, 2, 14 ] },
|
||||||
|
"east": { "texture": "#brass_casing", "uv": [ 0, 2, 16, 14 ] },
|
||||||
|
"south": { "texture": "#brass_casing", "uv": [ 14, 2, 16, 14 ] },
|
||||||
|
"west": { "texture": "#brass_casing", "uv": [ 0, 2, 16, 14 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Center",
|
||||||
|
"from": [ 2, 2, 1 ],
|
||||||
|
"to": [ 14, 14, 15 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 12, 12 ] },
|
||||||
|
"south": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 12, 12 ] },
|
||||||
|
"west": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 14, 12 ] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Indicator",
|
||||||
|
"from": [ -1, 2, 2 ],
|
||||||
|
"to": [ 1, 14, 14 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#iron_block", "uv": [ 14, 2, 16, 14 ] },
|
||||||
|
"south": { "texture": "#iron_block", "uv": [ 0, 2, 2, 14 ] },
|
||||||
|
"west": { "texture": "#iron_block", "uv": [ 2, 2, 14, 14 ] },
|
||||||
|
"up": { "texture": "#iron_block", "uv": [ 2, 0, 14, 2 ], "rotation": 270 },
|
||||||
|
"down": { "texture": "#iron_block", "uv": [ 2, 14, 14, 16 ], "rotation": 90 }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Indicator",
|
||||||
|
"from": [ 1, 2, 0 ],
|
||||||
|
"to": [ 4, 14, 3 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] },
|
||||||
|
"east": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] },
|
||||||
|
"west": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/1"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/2"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/3"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/4"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/5"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch",
|
||||||
|
"textures": {
|
||||||
|
"progress": "create:block/indicator/6"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/flex_crate"
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/stockpile_switch_4",
|
||||||
|
"display": {
|
||||||
|
"gui": {
|
||||||
|
"rotation": [ 30, 45, 0 ],
|
||||||
|
"translation": [ 0, 0, 0],
|
||||||
|
"scale":[ 0.625, 0.625, 0.625 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
BIN
src/main/resources/assets/create/textures/block/indicator/0.png
Normal file
After Width: | Height: | Size: 341 B |
BIN
src/main/resources/assets/create/textures/block/indicator/1.png
Normal file
After Width: | Height: | Size: 350 B |
BIN
src/main/resources/assets/create/textures/block/indicator/2.png
Normal file
After Width: | Height: | Size: 351 B |
BIN
src/main/resources/assets/create/textures/block/indicator/3.png
Normal file
After Width: | Height: | Size: 351 B |
BIN
src/main/resources/assets/create/textures/block/indicator/4.png
Normal file
After Width: | Height: | Size: 359 B |
BIN
src/main/resources/assets/create/textures/block/indicator/5.png
Normal file
After Width: | Height: | Size: 364 B |
BIN
src/main/resources/assets/create/textures/block/indicator/6.png
Normal file
After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 229 B After Width: | Height: | Size: 297 B |
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 324 B |
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 543 B |
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 544 B |
After Width: | Height: | Size: 13 KiB |