MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Roof models improved. Conditional recipe tag dependency handling fixed (issue #120).

Browse source
This commit is contained in:
stfwi 2020-08-24 15:41:55 +02:00
parent 3ac2f301de
commit 45fed1f374
40 changed files with 400 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gradle.properties
View file

@ -2,7 +2,7 @@
org.gradle.daemon=false org.gradle.daemon=false
org.gradle.jvmargs=-Xmx8G org.gradle.jvmargs=-Xmx8G
version_minecraft=1.16.2 version_minecraft=1.16.2
version_forge_minecraft=1.16.2-33.0.20 version_forge_minecraft=1.16.2-33.0.22
version_fml_mappings=20200514-1.16 version_fml_mappings=20200723-1.16.1
version_jei=1.16.2:7.1.3.19 version_jei=1.16.2:7.1.3.19
version_engineersdecor=1.1.2-b3 version_engineersdecor=1.1.2-b4

7
meta/update.json
View file

@ -1,12 +1,13 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.16.2": { "1.16.2": {
"1.1.2-b4": "[F] Mapping adaption to Forge 1.16.2-33.0.22/20200723-1.16.1.\n[F] Fixed conditional recipe tag dependency (thx Blu, Cyborgmas).",
"1.1.2-b3": "[F] Mapping adaption to Forge 1.16.2-33.0.20.", "1.1.2-b3": "[F] Mapping adaption to Forge 1.16.2-33.0.20.",
"1.1.2-b2": "[A] Dark Ceramic Root added.", "1.1.2-b2": "[A] Dark Shingle Roof added.",
"1.1.2-b1": "[U] Ported to MC1.16.2." "1.1.2-b1": "[U] Ported to MC1.16.2."
}, },
"promos": { "promos": {
"1.16.2-recommended": "1.1.2-b3", "1.16.2-recommended": "1.1.2-b4",
"1.16.2-latest": "1.1.2-b3" "1.16.2-latest": "1.1.2-b4"
} }
} }

5
readme.md
View file

@ -11,9 +11,12 @@ Mod sources for Minecraft version 1.16.2.
## Version history ## Version history
- v1.1.2-b4 [F] Mapping adaption to Forge 1.16.2-33.0.22/20200723-1.16.1.
[F] Fixed conditional recipe tag dependency (thx Blu, Cyborgmas).
- v1.1.2-b3 [F] Mapping adaption to Forge 1.16.2-33.0.20. - v1.1.2-b3 [F] Mapping adaption to Forge 1.16.2-33.0.20.
- v1.1.2-b2 [A] Dark Ceramic Root added. - v1.1.2-b2 [A] Dark Shingle Roof added.
- v1.1.2-b1 [U] Ported to MC1.16.2. - v1.1.2-b1 [U] Ported to MC1.16.2.

10
src/main/java/wile/engineersdecor/ModContent.java
View file

@ -333,19 +333,19 @@ public class ModContent
public static final DecorBlock.DirectedWaterLoggable INSET_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable( public static final DecorBlock.DirectedWaterLoggable INSET_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT|DecorBlock.CFG_AI_PASSABLE, DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT|DecorBlock.CFG_AI_PASSABLE,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).func_235838_a_((state)->15).notSolid(), Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).setLightLevel((state)->15).notSolid(),
Auxiliaries.getPixeledAABB(5.2,5.2,0, 10.8,10.8,0.3) Auxiliaries.getPixeledAABB(5.2,5.2,0, 10.8,10.8,0.3)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_inset_light")); )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_inset_light"));
public static final DecorBlock.DirectedWaterLoggable FLOOR_EDGE_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable( public static final DecorBlock.DirectedWaterLoggable FLOOR_EDGE_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE, DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).func_235838_a_((state)->15).notSolid(), Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).setLightLevel((state)->15).notSolid(),
Auxiliaries.getPixeledAABB(5,0,0, 11,2,0.5) Auxiliaries.getPixeledAABB(5,0,0, 11,2,0.5)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_floor_edge_light")); )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_floor_edge_light"));
public static final DecorBlock.DirectedWaterLoggable CEILING_EDGE_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable( public static final DecorBlock.DirectedWaterLoggable CEILING_EDGE_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE, DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).func_235838_a_((state)->15).notSolid(), Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).setLightLevel((state)->15).notSolid(),
new AxisAlignedBB[]{ new AxisAlignedBB[]{
Auxiliaries.getPixeledAABB( 0,15.5,0, 16,16,2.0), Auxiliaries.getPixeledAABB( 0,15.5,0, 16,16,2.0),
Auxiliaries.getPixeledAABB( 0,14.0,0, 16,16,0.5), Auxiliaries.getPixeledAABB( 0,14.0,0, 16,16,0.5),
@ -356,7 +356,7 @@ public class ModContent
public static final DecorBlock.DirectedWaterLoggable BULB_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable( public static final DecorBlock.DirectedWaterLoggable BULB_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT|DecorBlock.CFG_AI_PASSABLE, DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT|DecorBlock.CFG_AI_PASSABLE,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).func_235838_a_((state)->15).notSolid(), Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).setLightLevel((state)->15).notSolid(),
new AxisAlignedBB[]{ new AxisAlignedBB[]{
Auxiliaries.getPixeledAABB(6.5,6.5,1, 9.5,9.5,4), Auxiliaries.getPixeledAABB(6.5,6.5,1, 9.5,9.5,4),
Auxiliaries.getPixeledAABB(6.0,6.0,0, 10.0,10.0,1.0) Auxiliaries.getPixeledAABB(6.0,6.0,0, 10.0,10.0,1.0)
@ -445,7 +445,7 @@ public class ModContent
public static final DecorBlock.DirectedWaterLoggable SIGN_MODLOGO = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable( public static final DecorBlock.DirectedWaterLoggable SIGN_MODLOGO = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE, DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_AI_PASSABLE,
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1000f).sound(SoundType.WOOD).func_235838_a_((state)->1).notSolid(), Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1f, 1000f).sound(SoundType.WOOD).setLightLevel((state)->1).notSolid(),
Auxiliaries.getPixeledAABB(0,0,15.6, 16,16,16.0) Auxiliaries.getPixeledAABB(0,0,15.6, 16,16,16.0)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_decor")); )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "sign_decor"));

4
src/main/java/wile/engineersdecor/blocks/EdBreaker.java
View file

@ -191,8 +191,8 @@ public class EdBreaker
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

2
src/main/java/wile/engineersdecor/blocks/EdChair.java
View file

@ -136,7 +136,7 @@ public class EdChair
boolean on_top_of_block_position = true; boolean on_top_of_block_position = true;
boolean use_next_negative_y_position = false; boolean use_next_negative_y_position = false;
EntityChair chair = new EntityChair(world); EntityChair chair = new EntityChair(world);
BlockPos chair_pos = chair.func_233580_cy_(); BlockPos chair_pos = chair.getPosition();
chair.chair_pos = pos; chair.chair_pos = pos;
chair.t_sit = 5; chair.t_sit = 5;
chair.prevPosX = chair_pos.getX(); chair.prevPosX = chair_pos.getX();

59
src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java
View file

@ -188,8 +188,8 @@ public class EdCraftingTable
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -214,7 +214,7 @@ public class EdCraftingTable
@Override @Override
public void handleUpdateTag(BlockState state, CompoundNBT tag) // on client public void handleUpdateTag(BlockState state, CompoundNBT tag) // on client
{ func_230337_a_/*read*/(state, tag); } { read(state, tag); }
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public double getMaxRenderDistanceSquared() public double getMaxRenderDistanceSquared()
@ -280,7 +280,7 @@ public class EdCraftingTable
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -1086,17 +1086,16 @@ public class EdCraftingTable
} }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ {
super.func_231160_c_(); super.init();
final int x0=guiLeft, y0=guiTop; final int x0=guiLeft, y0=guiTop;
buttons.clear(); buttons.clear();
if(with_assist) { if(with_assist) {
// func_230480_a_() === addButton(), now more addWidget() buttons.add(addButton(new ImageButton(x0+158,y0+30, 12,12, 194,44, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_NEXT))));
buttons.add(func_230480_a_(new ImageButton(x0+158,y0+30, 12,12, 194,44, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_NEXT)))); buttons.add(addButton(new ImageButton(x0+158,y0+16, 12,12, 180,30, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_PREV))));
buttons.add(func_230480_a_(new ImageButton(x0+158,y0+16, 12,12, 180,30, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_PREV)))); buttons.add(addButton(new ImageButton(x0+158,y0+44, 12,12, 194,8, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_CLEAR_GRID))));
buttons.add(func_230480_a_(new ImageButton(x0+158,y0+44, 12,12, 194,8, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_CLEAR_GRID)))); buttons.add(addButton(new ImageButton(x0+116,y0+10, 20,10, 183,95, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_NEXT_COLLISION_RECIPE))));
buttons.add(func_230480_a_(new ImageButton(x0+116,y0+10, 20,10, 183,95, 12, BACKGROUND, (bt)->action(CraftingTableContainer.BUTTON_NEXT_COLLISION_RECIPE))));
} }
{ {
List<TipRange> tooltips = new ArrayList<>(); List<TipRange> tooltips = new ArrayList<>();
@ -1104,31 +1103,31 @@ public class EdCraftingTable
String[] translation_keys = { "next", "prev", "clear", "nextcollisionrecipe", "fromstorage", "tostorage", "fromplayer", "toplayer" }; String[] translation_keys = { "next", "prev", "clear", "nextcollisionrecipe", "fromstorage", "tostorage", "fromplayer", "toplayer" };
for(int i=0; (i<buttons.size()) && (i<translation_keys.length); ++i) { for(int i=0; (i<buttons.size()) && (i<translation_keys.length); ++i) {
Button bt = buttons.get(i); Button bt = buttons.get(i);
tooltips.add(new TipRange(bt.field_230690_l_/*x*/,bt.field_230691_m_/*y*/, bt.func_230998_h_/*getWidth*/(), bt.func_238483_d_/*getHeight*/(), Auxiliaries.localizable(prefix+translation_keys[i]))); tooltips.add(new TipRange(bt.x,bt.y, bt.getWidth(), bt.getWidth_CLASH/*getHeight*/(), Auxiliaries.localizable(prefix+translation_keys[i])));
} }
tooltip.init(tooltips); tooltip.init(tooltips);
} }
} }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
if(with_assist) { if(with_assist) {
boolean is_collision = getContainer().has_recipe_collision(); boolean is_collision = getContainer().has_recipe_collision();
buttons.get(3).field_230693_o_/*visible*/ = is_collision; buttons.get(3).visible = is_collision;
buttons.get(3).field_230694_p_/*active*/ = is_collision; buttons.get(3).active = is_collision;
} }
func_230446_a_/*renderBackground*/(mx); renderBackground(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip.render(mx,this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); if(!tooltip.render(mx,this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230459_a_(MatrixStack mx, int mouseX, int mouseY) protected void func_230459_a_/*renderHoveredToolTip*/(MatrixStack mx, int mouseX, int mouseY)
{ {
if((!player.inventory.getItemStack().isEmpty()) || (getSlotUnderMouse() == null)) return; if((!player.inventory.getItemStack().isEmpty()) || (getSlotUnderMouse() == null)) return;
final Slot slot = getSlotUnderMouse(); final Slot slot = getSlotUnderMouse();
if(!slot.getStack().isEmpty()) { func_230457_a_/*renderTooltip*/(mx, slot.getStack(), mouseX, mouseY); return; } if(!slot.getStack().isEmpty()) { renderTooltip(mx, slot.getStack(), mouseX, mouseY); return; }
if(with_assist) { if(with_assist) {
int hist_index = -1; int hist_index = -1;
if(slot instanceof CraftingResultSlot) { if(slot instanceof CraftingResultSlot) {
@ -1139,22 +1138,22 @@ public class EdCraftingTable
if((hist_index < 0) || (hist_index >= history_slot_tooltip.length)) return; if((hist_index < 0) || (hist_index >= history_slot_tooltip.length)) return;
if(!history_slot_tooltip[hist_index]) return; if(!history_slot_tooltip[hist_index]) return;
ItemStack hist_stack = getContainer().history().current().get(hist_index); ItemStack hist_stack = getContainer().history().current().get(hist_index);
if(!hist_stack.isEmpty()) func_230457_a_/*renderTooltip*/(mx, hist_stack, mouseX, mouseY); if(!hist_stack.isEmpty()) renderTooltip(mx, hist_stack, mouseX, mouseY);
} }
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.color3f(1.0F, 1.0F, 1.0F); RenderSystem.color3f(1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(BACKGROUND); getMinecraft().getTextureManager().bindTexture(BACKGROUND);
final int x0=guiLeft, y0=guiTop; final int x0=guiLeft, y0=guiTop;
func_238474_b_(mx, x0, y0, 0, 0, xSize, ySize); blit(mx, x0, y0, 0, 0, xSize, ySize);
if(with_assist) { if(with_assist) {
for(int i=0; i<history_slot_tooltip.length; ++i) history_slot_tooltip[i] = false; for(int i=0; i<history_slot_tooltip.length; ++i) history_slot_tooltip[i] = false;
final List<ItemStack> crafting_template = getContainer().history().current(); final List<ItemStack> crafting_template = getContainer().history().current();
@ -1192,8 +1191,8 @@ public class EdCraftingTable
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void draw_template_item_at(MatrixStack mx, ItemStack stack, int x0, int y0, int x, int y) protected void draw_template_item_at(MatrixStack mx, ItemStack stack, int x0, int y0, int x, int y)
{ {
ItemRenderer ir = this.field_230707_j_; ItemRenderer ir = this.itemRenderer;
final int main_zl = func_230927_p_/*getBlitOffset*/(); final int main_zl = getBlitOffset();
final float zl = ir.zLevel; final float zl = ir.zLevel;
ir.zLevel = -80; ir.zLevel = -80;
RenderSystem.enableRescaleNormal(); RenderSystem.enableRescaleNormal();
@ -1205,13 +1204,13 @@ public class EdCraftingTable
RenderSystem.defaultAlphaFunc(); RenderSystem.defaultAlphaFunc();
RenderSystem.enableBlend(); RenderSystem.enableBlend();
ir.zLevel = zl; ir.zLevel = zl;
func_230926_e_/*setBlitOffset*/(100); setBlitOffset(100);
RenderSystem.colorMask(true, true, true, true); RenderSystem.colorMask(true, true, true, true);
RenderSystem.color4f(0.7f, 0.7f, 0.7f, 0.8f); RenderSystem.color4f(0.7f, 0.7f, 0.7f, 0.8f);
getMinecraft().getTextureManager().bindTexture(BACKGROUND); getMinecraft().getTextureManager().bindTexture(BACKGROUND);
func_238474_b_(mx, x0+x, y0+y, x, y, 16, 16); blit(mx, x0+x, y0+y, x, y, 16, 16);
RenderSystem.color4f(1f, 1f, 1f, 1f); RenderSystem.color4f(1f, 1f, 1f, 1f);
func_230926_e_/*setBlitOffset*/(main_zl); setBlitOffset(main_zl);
} }
protected void action(String message) protected void action(String message)
@ -1269,13 +1268,13 @@ public class EdCraftingTable
} }
@Override @Override
public boolean func_231043_a_/*mouseScrolled*/(double mouseX, double mouseY, double wheel_inc) public boolean mouseScrolled(double mouseX, double mouseY, double wheel_inc)
{ {
tooltip.resetTimer(); tooltip.resetTimer();
final Slot resultSlot = this.getSlotUnderMouse(); final Slot resultSlot = this.getSlotUnderMouse();
if((!with_crafting_slot_mouse_scrolling) || (!(resultSlot instanceof CraftingResultSlot))) { if((!with_crafting_slot_mouse_scrolling) || (!(resultSlot instanceof CraftingResultSlot))) {
return this.getEventListenerForPos(mouseX, mouseY).filter((evl) -> { return this.getEventListenerForPos(mouseX, mouseY).filter((evl) -> {
return evl.func_231043_a_/*mouseScrolled*/(mouseX, mouseY, wheel_inc); return evl.mouseScrolled(mouseX, mouseY, wheel_inc);
}).isPresent(); }).isPresent();
} }
int count = resultSlot.getStack().getCount(); int count = resultSlot.getStack().getCount();

58
src/main/java/wile/engineersdecor/blocks/EdDropper.java
View file

@ -322,8 +322,8 @@ public class EdDropper
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt, false); } { super.read(state, nbt); readnbt(nbt, false); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -401,7 +401,7 @@ public class EdDropper
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -672,6 +672,14 @@ public class EdDropper
drop_slot_index_ = next_slot(drop_slot_index_); drop_slot_index_ = next_slot(drop_slot_index_);
ItemStack ds = stacks_.get(ic); ItemStack ds = stacks_.get(ic);
if((!ds.isEmpty()) && (ds.getCount() >= drop_count_)) { if((!ds.isEmpty()) && (ds.getCount() >= drop_count_)) {
{
boolean skip_stack = false;
for(int ci = 0; (ci<CTRL_SLOTS_SIZE)&&(!skip_stack); ++ci) {
final ItemStack cmp_stack = stacks_.get(CTRL_SLOTS_FIRST+ci);
if(Inventories.areItemStacksIdentical(ds, cmp_stack)) skip_stack = true;
}
if(skip_stack) continue;
}
drop_stacks[0] = ds.split(drop_count_); drop_stacks[0] = ds.split(drop_count_);
stacks_.set(ic, ds); stacks_.set(ic, ds);
break; break;
@ -852,9 +860,9 @@ public class EdDropper
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ {
super.func_231160_c_(); super.init();
{ {
final String prefix = ModContent.FACTORY_DROPPER.getTranslationKey() + ".tooltips."; final String prefix = ModContent.FACTORY_DROPPER.getTranslationKey() + ".tooltips.";
final int x0 = getGuiLeft(), y0 = getGuiTop(); final int x0 = getGuiLeft(), y0 = getGuiTop();
@ -872,25 +880,25 @@ public class EdDropper
} }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
public boolean func_231044_a_/*mouseClicked*/(double mouseX, double mouseY, int mouseButton) public boolean mouseClicked(double mouseX, double mouseY, int mouseButton)
{ {
tooltip_.resetTimer(); tooltip_.resetTimer();
DropperContainer container = (DropperContainer)getContainer(); DropperContainer container = (DropperContainer)getContainer();
int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5); int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5);
if((!isPointInRegion(114, 1, 61, 79, mouseX, mouseY))) { if((!isPointInRegion(114, 1, 61, 79, mouseX, mouseY))) {
return super.func_231044_a_(mouseX, mouseY, mouseButton); return super.mouseClicked(mouseX, mouseY, mouseButton);
} else if(isPointInRegion(130, 10, 12, 25, mouseX, mouseY)) { } else if(isPointInRegion(130, 10, 12, 25, mouseX, mouseY)) {
int force_percent = 100 - MathHelper.clamp(((my-10)*100)/25, 0, 100); int force_percent = 100 - MathHelper.clamp(((my-10)*100)/25, 0, 100);
container.onGuiAction("drop_speed", force_percent); container.onGuiAction("drop_speed", force_percent);
@ -938,13 +946,13 @@ public class EdDropper
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_dropper_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_dropper_gui.png"));
final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize(); final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize();
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
DropperContainer container = (DropperContainer)getContainer(); DropperContainer container = (DropperContainer)getContainer();
// active drop slot // active drop slot
{ {
@ -952,14 +960,14 @@ public class EdDropper
if((drop_slot_index < 0) || (drop_slot_index >= 16)) drop_slot_index = 0; if((drop_slot_index < 0) || (drop_slot_index >= 16)) drop_slot_index = 0;
int x = (x0+9+((drop_slot_index % 6) * 18)); int x = (x0+9+((drop_slot_index % 6) * 18));
int y = (y0+5+((drop_slot_index / 6) * 17)); int y = (y0+5+((drop_slot_index / 6) * 17));
func_238474_b_(mx, x, y, 180, 45, 18, 18); blit(mx, x, y, 180, 45, 18, 18);
} }
// filter LEDs // filter LEDs
{ {
for(int i=0; i<3; ++i) { for(int i=0; i<3; ++i) {
int xt = 180 + (6 * container.field(12+i)), yt = 38; int xt = 180 + (6 * container.field(12+i)), yt = 38;
int x = x0 + 31 + (i * 36), y = y0 + 65; int x = x0 + 31 + (i * 36), y = y0 + 65;
func_238474_b_(mx, x, y, xt, yt, 6, 6); blit(mx, x, y, xt, yt, 6, 6);
} }
} }
// force adjustment // force adjustment
@ -967,31 +975,31 @@ public class EdDropper
int hy = 2 + (((100-container.field(0)) * 21) / 100); int hy = 2 + (((100-container.field(0)) * 21) / 100);
int x = x0+135, y = y0+12, xt = 181; int x = x0+135, y = y0+12, xt = 181;
int yt = 4 + (23-hy); int yt = 4 + (23-hy);
func_238474_b_(mx, x, y, xt, yt, 3, hy); blit(mx, x, y, xt, yt, 3, hy);
} }
// angle adjustment // angle adjustment
{ {
int x = x0 + 157 - 3 + ((container.field(1) * 12) / 100); int x = x0 + 157 - 3 + ((container.field(1) * 12) / 100);
int y = y0 + 22 - 3 - ((container.field(2) * 12) / 100); int y = y0 + 22 - 3 - ((container.field(2) * 12) / 100);
func_238474_b_(mx, x, y, 180, 30, 7, 7); blit(mx, x, y, 180, 30, 7, 7);
} }
// drop count // drop count
{ {
int x = x0 + 134 - 2 + (container.field(4)); int x = x0 + 134 - 2 + (container.field(4));
int y = y0 + 45; int y = y0 + 45;
func_238474_b_(mx, x, y, 190, 31, 5, 5); blit(mx, x, y, 190, 31, 5, 5);
} }
// drop period // drop period
{ {
int px = (int)Math.round(((33.0 * container.field(6)) / 100) + 1); int px = (int)Math.round(((33.0 * container.field(6)) / 100) + 1);
int x = x0 + 134 - 2 + MathHelper.clamp(px, 0, 33); int x = x0 + 134 - 2 + MathHelper.clamp(px, 0, 33);
int y = y0 + 56; int y = y0 + 56;
func_238474_b_(mx, x, y, 190, 31, 5, 5); blit(mx, x, y, 190, 31, 5, 5);
} }
// redstone input // redstone input
{ {
if(container.field(11) != 0) { if(container.field(11) != 0) {
func_238474_b_(mx, x0+114, y0+51, 189, 18, 9, 9); blit(mx, x0+114, y0+51, 189, 18, 9, 9);
} }
} }
// trigger logic // trigger logic
@ -999,14 +1007,14 @@ public class EdDropper
int filter_gate_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_FILTER_ANDGATE) != 0) ? 11 : 0; int filter_gate_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_FILTER_ANDGATE) != 0) ? 11 : 0;
int extern_gate_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_EXTERN_ANDGATE) != 0) ? 11 : 0; int extern_gate_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_EXTERN_ANDGATE) != 0) ? 11 : 0;
int pulse_mode_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_CONTINUOUS ) != 0) ? 10 : 0; int pulse_mode_offset = ((container.field(5) & DropperTileEntity.DROPLOGIC_CONTINUOUS ) != 0) ? 10 : 0;
func_238474_b_(mx, x0+132, y0+66, 179+filter_gate_offset, 66, 9, 9); blit(mx, x0+132, y0+66, 179+filter_gate_offset, 66, 9, 9);
func_238474_b_(mx, x0+148, y0+66, 179+extern_gate_offset, 66, 9, 9); blit(mx, x0+148, y0+66, 179+extern_gate_offset, 66, 9, 9);
func_238474_b_(mx, x0+162, y0+66, 200+pulse_mode_offset, 66, 9, 9); blit(mx, x0+162, y0+66, 200+pulse_mode_offset, 66, 9, 9);
} }
// drop timer running indicator // drop timer running indicator
{ {
if((container.field(9) > DropperTileEntity.DROP_PERIOD_OFFSET) && ((System.currentTimeMillis() % 1000) < 500)) { if((container.field(9) > DropperTileEntity.DROP_PERIOD_OFFSET) && ((System.currentTimeMillis() % 1000) < 500)) {
func_238474_b_(mx, x0+149, y0+51, 201, 39, 3, 3); blit(mx, x0+149, y0+51, 201, 39, 3, 3);
} }
} }
RenderSystem.disableBlend(); RenderSystem.disableBlend();

40
src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java
View file

@ -225,8 +225,8 @@ public class EdElectricalFurnace
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -792,9 +792,9 @@ public class EdElectricalFurnace
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ {
super.func_231160_c_(); super.init();
{ {
final String prefix = ModContent.SMALL_ELECTRICAL_FURNACE.getTranslationKey() + ".tooltips."; final String prefix = ModContent.SMALL_ELECTRICAL_FURNACE.getTranslationKey() + ".tooltips.";
final int x0 = getGuiLeft(), y0 = getGuiTop(); final int x0 = getGuiLeft(), y0 = getGuiTop();
@ -807,52 +807,52 @@ public class EdElectricalFurnace
} }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_electrical_furnace_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_electrical_furnace_gui.png"));
final int x0=guiLeft, y0=guiTop, w=xSize, h=ySize; final int x0=guiLeft, y0=guiTop, w=xSize, h=ySize;
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
if(getContainer().field(6)!=0) { if(getContainer().field(6)!=0) {
final int hi = 13; final int hi = 13;
final int k = heat_px(hi); final int k = heat_px(hi);
func_238474_b_(mx, x0+62, y0+55+hi-k, 177, hi-k, 13, k); blit(mx, x0+62, y0+55+hi-k, 177, hi-k, 13, k);
} }
func_238474_b_(mx, x0+79, y0+30, 176, 15, 1+progress_px(17), 15); blit(mx, x0+79, y0+30, 176, 15, 1+progress_px(17), 15);
int we = energy_px(32, 8); int we = energy_px(32, 8);
if(we>0) func_238474_b_(mx, x0+90, y0+54, 185, 30, we, 13); if(we>0) blit(mx, x0+90, y0+54, 185, 30, we, 13);
switch(getContainer().field(4)) { switch(getContainer().field(4)) {
case 0: func_238474_b_(mx, x0+144, y0+57, 180, 57, 6, 9); break; case 0: blit(mx, x0+144, y0+57, 180, 57, 6, 9); break;
case 1: func_238474_b_(mx, x0+142, y0+58, 190, 58, 9, 6); break; case 1: blit(mx, x0+142, y0+58, 190, 58, 9, 6); break;
case 2: func_238474_b_(mx, x0+144, y0+56, 200, 57, 6, 9); break; case 2: blit(mx, x0+144, y0+56, 200, 57, 6, 9); break;
case 3: func_238474_b_(mx, x0+143, y0+58, 210, 58, 9, 6); break; case 3: blit(mx, x0+143, y0+58, 210, 58, 9, 6); break;
default: break; default: break;
} }
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }
@Override @Override
public boolean func_231044_a_/*mouseClicked*/(double mouseX, double mouseY, int mouseButton) public boolean mouseClicked/*mouseClicked*/(double mouseX, double mouseY, int mouseButton)
{ {
tooltip_.resetTimer(); tooltip_.resetTimer();
ElectricalFurnaceContainer container = (ElectricalFurnaceContainer)getContainer(); ElectricalFurnaceContainer container = (ElectricalFurnaceContainer)getContainer();
int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5); int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5);
if((!isPointInRegion(136, 48, 28, 28, mouseX, mouseY))) { if((!isPointInRegion(136, 48, 28, 28, mouseX, mouseY))) {
return super.func_231044_a_(mouseX, mouseY, mouseButton); return super.mouseClicked(mouseX, mouseY, mouseButton);
} else if(isPointInRegion(144, 64, 6, 10, mouseX, mouseY)) { } else if(isPointInRegion(144, 64, 6, 10, mouseX, mouseY)) {
container.onGuiAction("speed", 0); container.onGuiAction("speed", 0);
} else if(isPointInRegion(134, 58, 10, 6, mouseX, mouseY)) { } else if(isPointInRegion(134, 58, 10, 6, mouseX, mouseY)) {

4
src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java
View file

@ -282,8 +282,8 @@ public class EdFluidBarrel
} }
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

4
src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java
View file

@ -200,8 +200,8 @@ public class EdFluidFunnel
// TileEntity ----------------------------------------------------------------------------------------- // TileEntity -----------------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

30
src/main/java/wile/engineersdecor/blocks/EdFurnace.java
View file

@ -313,8 +313,8 @@ public class EdFurnace
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -398,7 +398,7 @@ public class EdFurnace
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -815,7 +815,7 @@ public class EdFurnace
while(xp > 0) { while(xp > 0) {
int k = ExperienceOrbEntity.getXPSplit(xp); int k = ExperienceOrbEntity.getXPSplit(xp);
xp -= k; xp -= k;
player_.world.addEntity((new ExperienceOrbEntity(player_.world, player_.func_233580_cy_().getX(), player_.func_233580_cy_().getY()+0.5, player_.func_233580_cy_().getZ()+0.5, k))); player_.world.addEntity((new ExperienceOrbEntity(player_.world, player_.getPosition().getX(), player_.getPosition().getY()+0.5, player_.getPosition().getZ()+0.5, k)));
} }
} }
removeCount = 0; removeCount = 0;
@ -985,35 +985,35 @@ public class EdFurnace
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ super.func_231160_c_(); } { super.init(); }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color3f(1.0F, 1.0F, 1.0F); RenderSystem.color3f(1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_lab_furnace_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_lab_furnace_gui.png"));
final int x0=guiLeft, y0=guiTop, w=xSize, h=ySize; final int x0=guiLeft, y0=guiTop, w=xSize, h=ySize;
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
if(getContainer().field(4) != 0) { if(getContainer().field(4) != 0) {
final int k = flame_px(13); final int k = flame_px(13);
func_238474_b_(mx, x0+59, y0+36+12-k, 176, 12-k, 14, k+1); blit(mx, x0+59, y0+36+12-k, 176, 12-k, 14, k+1);
} }
func_238474_b_(mx, x0+79, y0+36, 176, 15, 1+progress_px(17), 15); blit(mx, x0+79, y0+36, 176, 15, 1+progress_px(17), 15);
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }

46
src/main/java/wile/engineersdecor/blocks/EdHopper.java
View file

@ -291,8 +291,8 @@ public class EdHopper
// TileEntity -------------------------------------------------------------------------------------------- // TileEntity --------------------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt, false); } { super.read(state, nbt); readnbt(nbt, false); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -370,7 +370,7 @@ public class EdHopper
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -597,7 +597,7 @@ public class EdHopper
int n_collected = 0; int n_collected = 0;
for(ItemEntity ie:items) { for(ItemEntity ie:items) {
boolean is_direct_collection_tange = ie.getDistanceSq(rpos)<0.7; boolean is_direct_collection_tange = ie.getDistanceSq(rpos)<0.7;
if(!is_direct_collection_tange && (ie.cannotPickup() || (!ie.func_233570_aj_()/*onGround*/))) continue; if(!is_direct_collection_tange && (ie.cannotPickup() || (!ie.isOnGround()))) continue;
ItemStack stack = ie.getItem(); ItemStack stack = ie.getItem();
int n_accepted = try_insert_into_hopper(stack); int n_accepted = try_insert_into_hopper(stack);
if(n_accepted <= 0) continue; if(n_accepted <= 0) continue;
@ -844,9 +844,9 @@ public class EdHopper
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ {
super.func_231160_c_(); super.init();
{ {
final String prefix = ModContent.FACTORY_HOPPER.getTranslationKey() + ".tooltips."; final String prefix = ModContent.FACTORY_HOPPER.getTranslationKey() + ".tooltips.";
final int x0 = getGuiLeft(), y0 = getGuiTop(); final int x0 = getGuiLeft(), y0 = getGuiTop();
@ -863,15 +863,15 @@ public class EdHopper
} }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@ -888,13 +888,13 @@ public class EdHopper
} }
@Override @Override
public boolean func_231044_a_/*mouseClicked*/(double mouseX, double mouseY, int mouseButton) public boolean mouseClicked(double mouseX, double mouseY, int mouseButton)
{ {
tooltip_.resetTimer(); tooltip_.resetTimer();
HopperContainer container = (HopperContainer)getContainer(); HopperContainer container = (HopperContainer)getContainer();
int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5); int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5);
if((!isPointInRegion(126, 1, 49, 60, mouseX, mouseY))) { if((!isPointInRegion(126, 1, 49, 60, mouseX, mouseY))) {
return super.func_231044_a_(mouseX, mouseY, mouseButton); return super.mouseClicked(mouseX, mouseY, mouseButton);
} else if(isPointInRegion(128, 9, 44, 10, mouseX, mouseY)) { } else if(isPointInRegion(128, 9, 44, 10, mouseX, mouseY)) {
int range = (mx-133); int range = (mx-133);
if(range < -1) { if(range < -1) {
@ -939,13 +939,13 @@ public class EdHopper
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_hopper_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_hopper_gui.png"));
final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize(); final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize();
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
HopperContainer container = (HopperContainer)getContainer(); HopperContainer container = (HopperContainer)getContainer();
// active slot // active slot
{ {
@ -953,7 +953,7 @@ public class EdHopper
if((slot_index < 0) || (slot_index >= HopperTileEntity.NUM_OF_SLOTS)) slot_index = 0; if((slot_index < 0) || (slot_index >= HopperTileEntity.NUM_OF_SLOTS)) slot_index = 0;
int x = (x0+10+((slot_index % 6) * 18)); int x = (x0+10+((slot_index % 6) * 18));
int y = (y0+8+((slot_index / 6) * 17)); int y = (y0+8+((slot_index / 6) * 17));
func_238474_b_(mx, x, y, 200, 8, 18, 18); blit(mx, x, y, 200, 8, 18, 18);
} }
// collection range // collection range
{ {
@ -961,38 +961,38 @@ public class EdHopper
int px = lut[MathHelper.clamp(container.field(0), 0, HopperTileEntity.MAX_COLLECTION_RANGE)]; int px = lut[MathHelper.clamp(container.field(0), 0, HopperTileEntity.MAX_COLLECTION_RANGE)];
int x = x0 + px - 2; int x = x0 + px - 2;
int y = y0 + 14; int y = y0 + 14;
func_238474_b_(mx, x, y, 179, 40, 5, 5); blit(mx, x, y, 179, 40, 5, 5);
} }
// transfer period // transfer period
{ {
int px = (int)Math.round(((33.5 * container.field(3)) / 100) + 1); int px = (int)Math.round(((33.5 * container.field(3)) / 100) + 1);
int x = x0 + 132 - 2 + MathHelper.clamp(px, 0, 34); int x = x0 + 132 - 2 + MathHelper.clamp(px, 0, 34);
int y = y0 + 27; int y = y0 + 27;
func_238474_b_(mx, x, y, 179, 40, 5, 5); blit(mx, x, y, 179, 40, 5, 5);
} }
// transfer count // transfer count
{ {
int x = x0 + 133 - 2 + (container.field(1)); int x = x0 + 133 - 2 + (container.field(1));
int y = y0 + 40; int y = y0 + 40;
func_238474_b_(mx, x, y, 179, 40, 5, 5); blit(mx, x, y, 179, 40, 5, 5);
} }
// redstone input // redstone input
{ {
if(container.field(5) != 0) { if(container.field(5) != 0) {
func_238474_b_(mx, x0+133, y0+49, 217, 49, 9, 9); blit(mx, x0+133, y0+49, 217, 49, 9, 9);
} }
} }
// trigger logic // trigger logic
{ {
int inverter_offset = ((container.field(2) & HopperTileEntity.LOGIC_INVERTED) != 0) ? 11 : 0; int inverter_offset = ((container.field(2) & HopperTileEntity.LOGIC_INVERTED) != 0) ? 11 : 0;
func_238474_b_(mx, x0+145, y0+49, 177+inverter_offset, 49, 9, 9); blit(mx, x0+145, y0+49, 177+inverter_offset, 49, 9, 9);
int pulse_mode_offset = ((container.field(2) & HopperTileEntity.LOGIC_CONTINUOUS ) != 0) ? 9 : 0; int pulse_mode_offset = ((container.field(2) & HopperTileEntity.LOGIC_CONTINUOUS ) != 0) ? 9 : 0;
func_238474_b_(mx, x0+159, y0+49, 199+pulse_mode_offset, 49, 9, 9); blit(mx, x0+159, y0+49, 199+pulse_mode_offset, 49, 9, 9);
} }
// delay timer running indicator // delay timer running indicator
{ {
if((container.field(4) > HopperTileEntity.PERIOD_OFFSET) && ((System.currentTimeMillis() % 1000) < 500)) { if((container.field(4) > HopperTileEntity.PERIOD_OFFSET) && ((System.currentTimeMillis() % 1000) < 500)) {
func_238474_b_(mx, x0+148, y0+22, 187, 22, 3, 3); blit(mx, x0+148, y0+22, 187, 22, 3, 3);
} }
} }
RenderSystem.disableBlend(); RenderSystem.disableBlend();

30
src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java
View file

@ -249,8 +249,8 @@ public class EdLabeledCrate
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -282,7 +282,7 @@ public class EdLabeledCrate
@Override @Override
public void handleUpdateTag(BlockState state, CompoundNBT tag) // on client public void handleUpdateTag(BlockState state, CompoundNBT tag) // on client
{ func_230337_a_/*read*/(state, tag); } { read(state, tag); }
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public double getMaxRenderDistanceSquared() public double getMaxRenderDistanceSquared()
@ -357,7 +357,7 @@ public class EdLabeledCrate
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -720,29 +720,29 @@ public class EdLabeledCrate
} }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ super.func_231160_c_(); } { super.init(); }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/labeled_crate_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/labeled_crate_gui.png"));
final int x0=guiLeft, y0=this.guiTop, w=xSize, h=ySize; final int x0=guiLeft, y0=this.guiTop, w=xSize, h=ySize;
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
} }
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
@ -768,9 +768,9 @@ public class EdLabeledCrate
} }
@Override @Override
public boolean func_231043_a_/*mouseScrolled*/(double mouseX, double mouseY, double wheel_inc) public boolean mouseScrolled(double mouseX, double mouseY, double wheel_inc)
{ {
if(!with_gui_mouse_handling) return super.func_231043_a_/*mouseScrolled*/(mouseX, mouseY, wheel_inc); if(!with_gui_mouse_handling) return super.mouseScrolled(mouseX, mouseY, wheel_inc);
final Slot slot = getSlotUnderMouse(); final Slot slot = getSlotUnderMouse();
if(!slot.getHasStack()) return true; if(!slot.getHasStack()) return true;
final int count = slot.getStack().getCount(); final int count = slot.getStack().getCount();

4
src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java
View file

@ -85,10 +85,10 @@ public class EdLadderBlock extends LadderBlock implements IDecorBlock
// Player update event, forwarded from the main mod instance. // Player update event, forwarded from the main mod instance.
public static void onPlayerUpdateEvent(final PlayerEntity player) public static void onPlayerUpdateEvent(final PlayerEntity player)
{ {
if((without_speed_boost_) || (player.func_233570_aj_()/*onGround*/) || (!player.isOnLadder()) || (player.isSteppingCarefully()) || (player.isSpectator())) return; if((without_speed_boost_) || (player.isOnGround()) || (!player.isOnLadder()) || (player.isSteppingCarefully()) || (player.isSpectator())) return;
double lvy = player.getLookVec().y; double lvy = player.getLookVec().y;
if(Math.abs(lvy) < 0.94) return; if(Math.abs(lvy) < 0.94) return;
final BlockPos pos = player.func_233580_cy_(); final BlockPos pos = player.getPosition();
final BlockState state = player.world.getBlockState(pos); final BlockState state = player.world.getBlockState(pos);
if(!(state.getBlock() instanceof EdLadderBlock)) return; if(!(state.getBlock() instanceof EdLadderBlock)) return;
player.fallDistance = 0; player.fallDistance = 0;

16
src/main/java/wile/engineersdecor/blocks/EdMilker.java
View file

@ -256,8 +256,8 @@ public class EdMilker
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt, false); } { super.read(state, nbt); readnbt(nbt, false); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -401,7 +401,7 @@ public class EdMilker
{ {
if((tracked_cow_ == null) && (fluid_level() >= MAX_MILKING_TANK_LEVEL)) return false; // nothing to do if((tracked_cow_ == null) && (fluid_level() >= MAX_MILKING_TANK_LEVEL)) return false; // nothing to do
final Direction facing = world.getBlockState(getPos()).get(MilkerBlock.HORIZONTAL_FACING).getOpposite(); final Direction facing = world.getBlockState(getPos()).get(MilkerBlock.HORIZONTAL_FACING).getOpposite();
final Vector3d target_pos = Vector3d.func_237489_a_(getPos().offset(facing)).add(0.5,0,0.5); final Vector3d target_pos = Vector3d.copy(getPos().offset(facing)).add(0.5,0,0.5);
CowEntity cow = null; CowEntity cow = null;
{ {
AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(facing, 3)).grow(4, 2, 4); AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(facing, 3)).grow(4, 2, 4);
@ -439,23 +439,23 @@ public class EdMilker
BlockPos p = getPos().offset(facing,2); BlockPos p = getPos().offset(facing,2);
log("Idle: Shove off"); log("Idle: Shove off");
blocker.setNoAI(false); blocker.setNoAI(false);
SingleMoveGoal.startFor(blocker, p, 2, 1.0, (goal, world, pos)->(pos.distanceSq(goal.getCreature().func_233580_cy_())>100)); SingleMoveGoal.startFor(blocker, p, 2, 1.0, (goal, world, pos)->(pos.distanceSq(goal.getCreature().getPosition())>100));
} }
return false; return false;
} }
if(cow.getLeashed() || cow.isChild() || cow.isInLove() || (!cow.func_233570_aj_()/*onGround*/) || cow.isBeingRidden() || cow.isSprinting()) return false; if(cow.getLeashed() || cow.isChild() || cow.isInLove() || (!cow.isOnGround()) || cow.isBeingRidden() || cow.isSprinting()) return false;
tracked_cows_.put(cow.getEntityId(), cow.getEntityWorld().getGameTime()); tracked_cows_.put(cow.getEntityId(), cow.getEntityWorld().getGameTime());
tracked_cow_ = cow.getUniqueID(); tracked_cow_ = cow.getUniqueID();
state_ = MilkingState.PICKED; state_ = MilkingState.PICKED;
state_timeout_ = 200; state_timeout_ = 200;
tracked_cow_original_position_ = cow.func_233580_cy_(); tracked_cow_original_position_ = cow.getPosition();
log("Idle: Picked cow " + tracked_cow_); log("Idle: Picked cow " + tracked_cow_);
return false; return false;
} }
case PICKED: { case PICKED: {
SingleMoveGoal.startFor( SingleMoveGoal.startFor(
cow, target_pos, 2, 1.0, cow, target_pos, 2, 1.0,
(goal, world, pos)->(pos.distanceSq(goal.getCreature().func_233580_cy_())>100), (goal, world, pos)->(pos.distanceSq(goal.getCreature().getPosition())>100),
(goal, world, pos)->{ (goal, world, pos)->{
log("move: position reached"); log("move: position reached");
goal.getCreature().setLocationAndAngles(goal.getTargetPosition().getX(), goal.getTargetPosition().getY(), goal.getTargetPosition().getZ(), facing.getHorizontalAngle(), 0); goal.getCreature().setLocationAndAngles(goal.getTargetPosition().getX(), goal.getTargetPosition().getY(), goal.getTargetPosition().getZ(), facing.getHorizontalAngle(), 0);
@ -505,7 +505,7 @@ public class EdMilker
} }
case LEAVING: { case LEAVING: {
BlockPos p = (tracked_cow_original_position_ != null) ? (tracked_cow_original_position_) : getPos().offset(facing,2).offset(facing.rotateYCCW()); BlockPos p = (tracked_cow_original_position_ != null) ? (tracked_cow_original_position_) : getPos().offset(facing,2).offset(facing.rotateYCCW());
SingleMoveGoal.startFor(cow, p, 2, 1.0, (goal, world, pos)->(pos.distanceSq(goal.getCreature().func_233580_cy_())>100)); SingleMoveGoal.startFor(cow, p, 2, 1.0, (goal, world, pos)->(pos.distanceSq(goal.getCreature().getPosition())>100));
state_timeout_ = 600; state_timeout_ = 600;
state_timer_ = 500; state_timer_ = 500;
tick_timer_ = TICK_INTERVAL; tick_timer_ = TICK_INTERVAL;

4
src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java
View file

@ -332,8 +332,8 @@ public class EdMineralSmelter
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

36
src/main/java/wile/engineersdecor/blocks/EdPlacer.java
View file

@ -261,8 +261,8 @@ public class EdPlacer
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt, false); } { super.read(state, nbt); readnbt(nbt, false); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -341,7 +341,7 @@ public class EdPlacer
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -712,9 +712,9 @@ public class EdPlacer
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ {
super.func_231160_c_(); super.init();
{ {
final String prefix = ModContent.FACTORY_PLACER.getTranslationKey() + ".tooltips."; final String prefix = ModContent.FACTORY_PLACER.getTranslationKey() + ".tooltips.";
final int x0 = getGuiLeft(), y0 = getGuiTop(); final int x0 = getGuiLeft(), y0 = getGuiTop();
@ -727,25 +727,25 @@ public class EdPlacer
} }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
public boolean func_231044_a_/*mouseClicked*/(double mouseX, double mouseY, int mouseButton) public boolean mouseClicked/*mouseClicked*/(double mouseX, double mouseY, int mouseButton)
{ {
tooltip_.resetTimer(); tooltip_.resetTimer();
PlacerContainer container = (PlacerContainer)getContainer(); PlacerContainer container = (PlacerContainer)getContainer();
int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5); int mx = (int)(mouseX - getGuiLeft() + .5), my = (int)(mouseY - getGuiTop() + .5);
if((!isPointInRegion(126, 1, 49, 60, mouseX, mouseY))) { if((!isPointInRegion(126, 1, 49, 60, mouseX, mouseY))) {
return super.func_231044_a_(mouseX, mouseY, mouseButton); return super.mouseClicked(mouseX, mouseY, mouseButton);
} else if(isPointInRegion(133, 49, 9, 9, mouseX, mouseY)) { } else if(isPointInRegion(133, 49, 9, 9, mouseX, mouseY)) {
container.onGuiAction("manual_trigger", 1); container.onGuiAction("manual_trigger", 1);
} else if(isPointInRegion(145, 49, 9, 9, mouseX, mouseY)) { } else if(isPointInRegion(145, 49, 9, 9, mouseX, mouseY)) {
@ -758,13 +758,13 @@ public class EdPlacer
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
this.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_placer_gui.png")); this.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/factory_placer_gui.png"));
final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize(); final int x0=getGuiLeft(), y0=getGuiTop(), w=getXSize(), h=getYSize();
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
PlacerContainer container = (PlacerContainer)getContainer(); PlacerContainer container = (PlacerContainer)getContainer();
// active slot // active slot
{ {
@ -772,20 +772,20 @@ public class EdPlacer
if((slot_index < 0) || (slot_index >= PlacerTileEntity.NUM_OF_SLOTS)) slot_index = 0; if((slot_index < 0) || (slot_index >= PlacerTileEntity.NUM_OF_SLOTS)) slot_index = 0;
int x = (x0+10+((slot_index % 6) * 18)); int x = (x0+10+((slot_index % 6) * 18));
int y = (y0+8+((slot_index / 6) * 17)); int y = (y0+8+((slot_index / 6) * 17));
func_238474_b_(mx, x, y, 200, 8, 18, 18); blit(mx, x, y, 200, 8, 18, 18);
} }
// redstone input // redstone input
{ {
if(container.field(1) != 0) { if(container.field(1) != 0) {
func_238474_b_(mx, x0+133, y0+49, 217, 49, 9, 9); blit(mx, x0+133, y0+49, 217, 49, 9, 9);
} }
} }
// trigger logic // trigger logic
{ {
int inverter_offset = ((container.field(0) & PlacerTileEntity.LOGIC_INVERTED) != 0) ? 11 : 0; int inverter_offset = ((container.field(0) & PlacerTileEntity.LOGIC_INVERTED) != 0) ? 11 : 0;
func_238474_b_(mx, x0+145, y0+49, 177+inverter_offset, 49, 9, 9); blit(mx, x0+145, y0+49, 177+inverter_offset, 49, 9, 9);
int pulse_mode_offset = ((container.field(0) & PlacerTileEntity.LOGIC_CONTINUOUS ) != 0) ? 9 : 0; int pulse_mode_offset = ((container.field(0) & PlacerTileEntity.LOGIC_CONTINUOUS ) != 0) ? 9 : 0;
func_238474_b_(mx, x0+159, y0+49, 199+pulse_mode_offset, 49, 9, 9); blit(mx, x0+159, y0+49, 199+pulse_mode_offset, 49, 9, 9);
} }
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }

4
src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java
View file

@ -166,8 +166,8 @@ public class EdSolarPanel
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt, false); } { super.read(state, nbt); readnbt(nbt, false); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

4
src/main/java/wile/engineersdecor/blocks/EdTestBlock.java
View file

@ -200,9 +200,9 @@ public class EdTestBlock
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ {
super.func_230337_a_(state, nbt); super.read(state, nbt);
if(nbt.contains("passive_tank")) passive_tank_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("passive_tank")); if(nbt.contains("passive_tank")) passive_tank_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("passive_tank"));
if(nbt.contains("passive_drain")) passive_drain_fluidstack_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("passive_drain")); if(nbt.contains("passive_drain")) passive_drain_fluidstack_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("passive_drain"));
if(nbt.contains("active")) active_fill_fluidstack_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("active")); if(nbt.contains("active")) active_fill_fluidstack_ = FluidStack.loadFluidStackFromNBT(nbt.getCompound("active"));

4
src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java
View file

@ -151,8 +151,8 @@ public class EdTreeCutter
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)

24
src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java
View file

@ -237,8 +237,8 @@ public class EdWasteIncinerator
// TileEntity ------------------------------------------------------------------------------ // TileEntity ------------------------------------------------------------------------------
@Override @Override
public void func_230337_a_(BlockState state, CompoundNBT nbt) public void read(BlockState state, CompoundNBT nbt)
{ super.func_230337_a_(state, nbt); readnbt(nbt); } { super.read(state, nbt); readnbt(nbt); }
@Override @Override
public CompoundNBT write(CompoundNBT nbt) public CompoundNBT write(CompoundNBT nbt)
@ -316,7 +316,7 @@ public class EdWasteIncinerator
@Override @Override
public boolean isUsableByPlayer(PlayerEntity player) public boolean isUsableByPlayer(PlayerEntity player)
{ return getPos().distanceSq(player.func_233580_cy_()) < 36; } { return getPos().distanceSq(player.getPosition()) < 36; }
@Override @Override
public void openInventory(PlayerEntity player) public void openInventory(PlayerEntity player)
@ -695,30 +695,30 @@ public class EdWasteIncinerator
{ super(container, player_inventory, title); this.player_ = player_inventory.player; } { super(container, player_inventory, title); this.player_ = player_inventory.player; }
@Override @Override
public void func_231160_c_/*init*/() public void init()
{ super.func_231160_c_(); } { super.init(); }
@Override @Override
public void func_230430_a_/*render*/(MatrixStack mx, int mouseX, int mouseY, float partialTicks) public void render(MatrixStack mx, int mouseX, int mouseY, float partialTicks)
{ {
func_230446_a_/*renderBackground*/(mx); renderBackground/*renderBackground*/(mx);
super.func_230430_a_(mx, mouseX, mouseY, partialTicks); super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY); func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
} }
@Override @Override
protected void func_230451_b_(MatrixStack mx, int x, int y) protected void drawGuiContainerForegroundLayer(MatrixStack mx, int x, int y)
{} {}
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected void func_230450_a_/*drawGuiContainerBackgroundLayer*/(MatrixStack mx, float partialTicks, int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer(MatrixStack mx, float partialTicks, int mouseX, int mouseY)
{ {
RenderSystem.enableBlend(); RenderSystem.enableBlend();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_waste_incinerator_gui.png")); getMinecraft().getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/small_waste_incinerator_gui.png"));
final int x0=guiLeft, y0=this.guiTop, w=xSize, h=ySize; final int x0=guiLeft, y0=this.guiTop, w=xSize, h=ySize;
func_238474_b_(mx, x0, y0, 0, 0, w, h); blit(mx, x0, y0, 0, 0, w, h);
RenderSystem.disableBlend(); RenderSystem.disableBlend();
} }
} }

8
src/main/java/wile/engineersdecor/libmc/blocks/StandardFenceBlock.java
View file

@ -42,10 +42,10 @@ import java.util.*;
public class StandardFenceBlock extends WallBlock implements StandardBlocks.IStandardBlock public class StandardFenceBlock extends WallBlock implements StandardBlocks.IStandardBlock
{ {
public static final BooleanProperty UP = BlockStateProperties.UP; public static final BooleanProperty UP = BlockStateProperties.UP;
public static final EnumProperty<WallHeight> WALL_EAST = BlockStateProperties.field_235908_S_; public static final EnumProperty<WallHeight> WALL_EAST = BlockStateProperties.WALL_HEIGHT_EAST;
public static final EnumProperty<WallHeight> WALL_NORTH = BlockStateProperties.field_235909_T_; public static final EnumProperty<WallHeight> WALL_NORTH = BlockStateProperties.WALL_HEIGHT_NORTH;
public static final EnumProperty<WallHeight> WALL_SOUTH = BlockStateProperties.field_235910_U_; public static final EnumProperty<WallHeight> WALL_SOUTH = BlockStateProperties.WALL_HEIGHT_SOUTH;
public static final EnumProperty<WallHeight> WALL_WEST = BlockStateProperties.field_235911_V_; public static final EnumProperty<WallHeight> WALL_WEST = BlockStateProperties.WALL_HEIGHT_WEST;
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
private final Map<BlockState, VoxelShape> shape_voxels; private final Map<BlockState, VoxelShape> shape_voxels;
private final Map<BlockState, VoxelShape> collision_shape_voxels; private final Map<BlockState, VoxelShape> collision_shape_voxels;

8
src/main/java/wile/engineersdecor/libmc/blocks/VariantWallBlock.java
View file

@ -44,10 +44,10 @@ import java.util.Map;
public class VariantWallBlock extends WallBlock implements StandardBlocks.IStandardBlock public class VariantWallBlock extends WallBlock implements StandardBlocks.IStandardBlock
{ {
public static final BooleanProperty UP = BlockStateProperties.UP; public static final BooleanProperty UP = BlockStateProperties.UP;
public static final EnumProperty<WallHeight> WALL_EAST = BlockStateProperties.field_235908_S_; public static final EnumProperty<WallHeight> WALL_EAST = BlockStateProperties.WALL_HEIGHT_EAST;
public static final EnumProperty<WallHeight> WALL_NORTH = BlockStateProperties.field_235909_T_; public static final EnumProperty<WallHeight> WALL_NORTH = BlockStateProperties.WALL_HEIGHT_NORTH;
public static final EnumProperty<WallHeight> WALL_SOUTH = BlockStateProperties.field_235910_U_; public static final EnumProperty<WallHeight> WALL_SOUTH = BlockStateProperties.WALL_HEIGHT_SOUTH;
public static final EnumProperty<WallHeight> WALL_WEST = BlockStateProperties.field_235911_V_; public static final EnumProperty<WallHeight> WALL_WEST = BlockStateProperties.WALL_HEIGHT_WEST;
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public static final IntegerProperty TEXTURE_VARIANT = IntegerProperty.create("tvariant", 0, 7); public static final IntegerProperty TEXTURE_VARIANT = IntegerProperty.create("tvariant", 0, 7);
private final Map<BlockState, VoxelShape> shape_voxels; private final Map<BlockState, VoxelShape> shape_voxels;

4
src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java
View file

@ -116,7 +116,7 @@ public class Auxiliaries
public static TranslationTextComponent localizable(String modtrkey, @Nullable TextFormatting color, Object... args) public static TranslationTextComponent localizable(String modtrkey, @Nullable TextFormatting color, Object... args)
{ {
TranslationTextComponent tr = new TranslationTextComponent((modtrkey.startsWith("block.") || (modtrkey.startsWith("item."))) ? (modtrkey) : (modid+"."+modtrkey), args); TranslationTextComponent tr = new TranslationTextComponent((modtrkey.startsWith("block.") || (modtrkey.startsWith("item."))) ? (modtrkey) : (modid+"."+modtrkey), args);
if(color!=null) tr.func_240701_a_(color); if(color!=null) tr.mergeStyle(color);
return tr; return tr;
} }
@ -130,7 +130,7 @@ public class Auxiliaries
public static String localize(String translationKey, Object... args) public static String localize(String translationKey, Object... args)
{ {
TranslationTextComponent tr = new TranslationTextComponent(translationKey, args); TranslationTextComponent tr = new TranslationTextComponent(translationKey, args);
tr.func_240701_a_(TextFormatting.RESET); tr.mergeStyle(TextFormatting.RESET);
final String ft = tr.getString(); final String ft = tr.getString();
if(ft.contains("${")) { if(ft.contains("${")) {
// Non-recursive, non-argument lang file entry cross referencing. // Non-recursive, non-argument lang file entry cross referencing.

2
src/main/java/wile/engineersdecor/libmc/detail/Networking.java
View file

@ -270,7 +270,7 @@ public class Networking
{ data_ = new TranslationTextComponent("[unset]"); } { data_ = new TranslationTextComponent("[unset]"); }
public OverlayTextMessage(final ITextComponent tct, int delay) public OverlayTextMessage(final ITextComponent tct, int delay)
{ data_ = (ITextComponent)tct.func_230532_e_(); delay_ = delay; } { data_ = (ITextComponent)tct.deepCopy(); delay_ = delay; }
public static OverlayTextMessage parse(final PacketBuffer buf) public static OverlayTextMessage parse(final PacketBuffer buf)
{ {

12
src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java
View file

@ -10,7 +10,9 @@ package wile.engineersdecor.libmc.detail;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.tags.ITag;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagCollectionManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.JSONUtils; import net.minecraft.util.JSONUtils;
import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.ICondition;
@ -24,6 +26,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -95,6 +98,7 @@ public class OptionalRecipeCondition implements ICondition
if(without_recipes) return false; if(without_recipes) return false;
if((experimental) && (!with_experimental)) return false; if((experimental) && (!with_experimental)) return false;
final IForgeRegistry<Item> item_registry = ForgeRegistries.ITEMS; final IForgeRegistry<Item> item_registry = ForgeRegistries.ITEMS;
final Map<ResourceLocation, ITag<Item>> item_tags = TagCollectionManager.func_242178_a().func_241836_b().func_241833_a(); // ItemTags.getCollection().getTagMap() not set yet
if(result != null) { if(result != null) {
boolean item_registered = item_registry.containsKey(result); boolean item_registered = item_registry.containsKey(result);
if(!item_registered) return false; // required result not registered if(!item_registered) return false; // required result not registered
@ -108,8 +112,8 @@ public class OptionalRecipeCondition implements ICondition
} }
if(!all_required_tags.isEmpty()) { if(!all_required_tags.isEmpty()) {
for(ResourceLocation rl:all_required_tags) { for(ResourceLocation rl:all_required_tags) {
if(!ItemTags.getCollection().func_241833_a()/*getTagMap()*/.containsKey(rl)) return false; if(!item_tags.containsKey(rl)) return false;
if(ItemTags.getCollection().func_241833_a()/*getTagMap()*/.get(rl).func_230236_b_().isEmpty()) return false; if(item_tags.get(rl).getAllElements().isEmpty()) return false;
} }
} }
if(!any_missing.isEmpty()) { if(!any_missing.isEmpty()) {
@ -120,8 +124,8 @@ public class OptionalRecipeCondition implements ICondition
} }
if(!any_missing_tags.isEmpty()) { if(!any_missing_tags.isEmpty()) {
for(ResourceLocation rl:any_missing_tags) { for(ResourceLocation rl:any_missing_tags) {
if(!ItemTags.getCollection().func_241833_a()/*getTagMap()*/.containsKey(rl)) return true; if(!item_tags.containsKey(rl)) return true;
if(ItemTags.getCollection().func_241833_a()/*getTagMap()*/.get(rl).func_230236_b_().isEmpty()) return true; if(item_tags.get(rl).getAllElements().isEmpty()) return true;
} }
return false; return false;
} }

12
src/main/java/wile/engineersdecor/libmc/detail/Overlay.java
View file

@ -99,12 +99,12 @@ public class Overlay
final int cy = (int)(win.getScaledHeight() * overlay_y_); final int cy = (int)(win.getScaledHeight() * overlay_y_);
final int w = fr.getStringWidth(txt); final int w = fr.getStringWidth(txt);
final int h = fr.FONT_HEIGHT; final int h = fr.FONT_HEIGHT;
func_238468_a_(mxs,cx-(w/2)-3, cy-2, cx+(w/2)+2, cy+h+2, 0xaa333333, 0xaa444444); fillGradient(mxs, cx-(w/2)-3, cy-2, cx+(w/2)+2, cy+h+2, 0xaa333333, 0xaa444444);
func_238465_a_(mxs,cx-(w/2)-3, cx+(w/2)+2, cy-2, 0xaa333333); hLine(mxs, cx-(w/2)-3, cx+(w/2)+2, cy-2, 0xaa333333);
func_238465_a_(mxs,cx-(w/2)-3, cx+(w/2)+2, cy+h+2, 0xaa333333); hLine(mxs, cx-(w/2)-3, cx+(w/2)+2, cy+h+2, 0xaa333333);
func_238473_b_(mxs,cx-(w/2)-3, cy-2, cy+h+2, 0xaa333333); vLine(mxs, cx-(w/2)-3, cy-2, cy+h+2, 0xaa333333);
func_238473_b_(mxs,cx+(w/2)+2, cy-2, cy+h+2, 0xaa333333); vLine(mxs, cx+(w/2)+2, cy-2, cy+h+2, 0xaa333333);
func_238471_a_(mxs, fr, txt, cx , cy+1, 0x00ffaa00); // drawCenteredString drawCenteredString(mxs, fr, txt, cx , cy+1, 0x00ffaa00);
} finally { } finally {
; // fr.setBidiFlag(was_unicode); ; // fr.setBidiFlag(was_unicode);
} }

2
src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java
View file

@ -92,7 +92,7 @@ public class TooltipDisplay
String text = tip.text.getString(); String text = tip.text.getString();
if(!text.isEmpty() && (!text.startsWith("block."))) { if(!text.isEmpty() && (!text.startsWith("block."))) {
try { try {
gui.func_243308_b(mx, Collections.singletonList(tip.text), x, y); gui.renderTooltip(mx, tip.text, x, y); //gui.func_243308_b(mx, Collections.singletonList(tip.text), x, y);
} catch(Exception ex) { } catch(Exception ex) {
had_render_exception = true; had_render_exception = true;
Auxiliaries.logError("Tooltip rendering disabled due to exception: '" + ex.getMessage() + "'"); Auxiliaries.logError("Tooltip rendering disabled due to exception: '" + ex.getMessage() + "'");

1
src/main/resources/assets/engineersdecor/lang/en_us.json
View file

@ -32,7 +32,6 @@
"engineersdecor.config.without_light_sources": "Without lights", "engineersdecor.config.without_light_sources": "Without lights",
"engineersdecor.config.without_mob_chair_sitting": "Without chair mob sitting", "engineersdecor.config.without_mob_chair_sitting": "Without chair mob sitting",
"engineersdecor.config.without_panzer_glass": "Without panzer glass", "engineersdecor.config.without_panzer_glass": "Without panzer glass",
"engineersdecor.config.without_passive_fluid_accumulator": "Without fluid accumulator",
"engineersdecor.config.without_poles": "Without poles", "engineersdecor.config.without_poles": "Without poles",
"engineersdecor.config.without_rebar_concrete": "Without rebar concrete", "engineersdecor.config.without_rebar_concrete": "Without rebar concrete",
"engineersdecor.config.without_recipes": "Without recipes", "engineersdecor.config.without_recipes": "Without recipes",

1
src/main/resources/assets/engineersdecor/lang/ru_ru.json
View file

@ -32,7 +32,6 @@
"engineersdecor.config.without_light_sources": "Без светильников", "engineersdecor.config.without_light_sources": "Без светильников",
"engineersdecor.config.without_mob_chair_sitting": "Без стульев для сидения для существ", "engineersdecor.config.without_mob_chair_sitting": "Без стульев для сидения для существ",
"engineersdecor.config.without_panzer_glass": "Без бронированного стекла", "engineersdecor.config.without_panzer_glass": "Без бронированного стекла",
"engineersdecor.config.without_passive_fluid_accumulator": "Без жидкостного накопителя",
"engineersdecor.config.without_poles": "Без столбов", "engineersdecor.config.without_poles": "Без столбов",
"engineersdecor.config.without_rebar_concrete": "Без железобетона", "engineersdecor.config.without_rebar_concrete": "Без железобетона",
"engineersdecor.config.without_recipes": "Без рецептов", "engineersdecor.config.without_recipes": "Без рецептов",

1
src/main/resources/assets/engineersdecor/lang/zh_cn.json
View file

@ -32,7 +32,6 @@
"engineersdecor.config.without_light_sources": "不要灯", "engineersdecor.config.without_light_sources": "不要灯",
"engineersdecor.config.without_mob_chair_sitting": "椅子不能给其他生物坐", "engineersdecor.config.without_mob_chair_sitting": "椅子不能给其他生物坐",
"engineersdecor.config.without_panzer_glass": "不要装甲玻璃", "engineersdecor.config.without_panzer_glass": "不要装甲玻璃",
"engineersdecor.config.without_passive_fluid_accumulator": "不要流体积累器",
"engineersdecor.config.without_poles": "不要杆", "engineersdecor.config.without_poles": "不要杆",
"engineersdecor.config.without_rebar_concrete": "不要强化混凝土", "engineersdecor.config.without_rebar_concrete": "不要强化混凝土",
"engineersdecor.config.without_recipes": "不要配方", "engineersdecor.config.without_recipes": "不要配方",

34
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json
View file

@ -1,5 +1,5 @@
{ {
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"particle": "engineersdecor:block/roof/dark_shingle_roof", "particle": "engineersdecor:block/roof/dark_shingle_roof",
"s": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof",
@ -10,11 +10,11 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [4, 3.5, 16], "to": [4, 3.5, 16],
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [0, 12, 4, 16], "texture": "#s"}, "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 12, 16, 16], "texture": "#s"}, "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 16], "texture": "#s"}, "up": {"uv": [0, 0, 4, 16], "texture": "#s"},
"down": {"uv": [0, 0, 4, 16], "texture": "#s"} "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -22,11 +22,11 @@
"to": [8, 7.5, 16], "to": [8, 7.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [4, 8, 8, 16], "texture": "#s"}, "south": {"uv": [4, 8, 8, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 8, 16, 16], "texture": "#s"}, "west": {"uv": [0, 8, 16, 16], "texture": "#s"},
"up": {"uv": [4, 0, 8, 16], "texture": "#s"}, "up": {"uv": [4, 0, 8, 16], "texture": "#s"},
"down": {"uv": [4, 0, 8, 16], "texture": "#s"} "down": {"uv": [4, 0, 8, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -89,10 +89,10 @@
"from": [8, 0, 0], "from": [8, 0, 0],
"to": [12, 11.5, 5], "to": [12, 11.5, 5],
"faces": { "faces": {
"north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 4.5, 5, 16], "texture": "#s"}, "west": {"uv": [0, 4.5, 5, 16], "texture": "#s"},
"up": {"uv": [8, 0, 12, 5], "texture": "#s"}, "up": {"uv": [8, 0, 12, 5], "texture": "#s"},
"down": {"uv": [8, 11, 12, 16], "texture": "#s"} "down": {"uv": [8, 11, 12, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -100,7 +100,7 @@
"to": [12, 5.5, 11], "to": [12, 5.5, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": { "faces": {
"down": {"uv": [8, 5, 12, 11], "texture": "#s"} "down": {"uv": [8, 5, 12, 11], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -108,10 +108,10 @@
"to": [12, 11.5, 16], "to": [12, 11.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 19]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 19]},
"faces": { "faces": {
"south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, "south": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [11, 4.5, 16, 16], "texture": "#s"}, "west": {"uv": [11, 4.5, 16, 16], "texture": "#s"},
"up": {"uv": [8, 11, 12, 16], "texture": "#s"}, "up": {"uv": [8, 11, 12, 16], "texture": "#s"},
"down": {"uv": [8, 0, 12, 5], "texture": "#s"} "down": {"uv": [8, 0, 12, 5], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -119,12 +119,12 @@
"to": [16, 15.5, 16], "to": [16, 15.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#s"}, "east": {"uv": [0, 0, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#s"}, "west": {"uv": [0, 0, 16, 16], "texture": "#s"},
"up": {"uv": [12, 0, 16, 16], "texture": "#s"}, "up": {"uv": [12, 0, 16, 16], "texture": "#s"},
"down": {"uv": [12, 0, 16, 16], "texture": "#s"} "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {

30
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json
View file

@ -1,5 +1,5 @@
{ {
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"particle": "engineersdecor:block/roof/dark_shingle_roof", "particle": "engineersdecor:block/roof/dark_shingle_roof",
"s": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof",
@ -10,11 +10,11 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [4, 3.5, 16], "to": [4, 3.5, 16],
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [0, 12, 4, 16], "texture": "#s"}, "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 12, 16, 16], "texture": "#s"}, "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 16], "texture": "#s"}, "up": {"uv": [0, 0, 4, 16], "texture": "#s"},
"down": {"uv": [0, 0, 4, 16], "texture": "#s"} "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -22,22 +22,22 @@
"to": [8, 7.5, 16], "to": [8, 7.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [4, 8, 8, 16], "texture": "#s"}, "south": {"uv": [4, 8, 8, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 8, 16, 16], "texture": "#s"}, "west": {"uv": [0, 8, 16, 16], "texture": "#s"},
"up": {"uv": [4, 0, 8, 16], "texture": "#s"}, "up": {"uv": [4, 0, 8, 16], "texture": "#s"},
"down": {"uv": [4, 0, 8, 16], "texture": "#s"} "down": {"uv": [4, 0, 8, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
"from": [8, 0, 0], "from": [8, 0, 0],
"to": [12, 11.5, 16], "to": [12, 11.5, 16],
"faces": { "faces": {
"north": {"uv": [4, 4, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4, 8, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [8, 4, 12, 16], "texture": "#s"}, "south": {"uv": [8, 4, 12, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 4, 16, 16], "texture": "#s"}, "west": {"uv": [0, 4, 16, 16], "texture": "#s"},
"up": {"uv": [8, 0, 12, 16], "texture": "#s"}, "up": {"uv": [8, 0, 12, 16], "texture": "#s"},
"down": {"uv": [8, 0, 12, 16], "texture": "#s"} "down": {"uv": [8, 0, 12, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -45,12 +45,12 @@
"to": [16, 15.5, 16], "to": [16, 15.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#s"}, "east": {"uv": [0, 0, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#s"}, "west": {"uv": [0, 0, 16, 16], "texture": "#s"},
"up": {"uv": [12, 0, 16, 16], "texture": "#s"}, "up": {"uv": [12, 0, 16, 16], "texture": "#s"},
"down": {"uv": [12, 0, 16, 16], "texture": "#s"} "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {

36
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json
View file

@ -9,12 +9,12 @@
"from": [12, 0, 0], "from": [12, 0, 0],
"to": [16, 15.5, 12], "to": [16, 15.5, 12],
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [4, 0.5, 16, 16], "texture": "#s"}, "east": {"uv": [4, 0.5, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"},
"west": {"uv": [0, 0.5, 12, 16], "texture": "#s"}, "west": {"uv": [0, 0.5, 12, 16], "texture": "#s"},
"up": {"uv": [12, 0, 16, 12], "texture": "#s"}, "up": {"uv": [12, 0, 16, 12], "texture": "#s"},
"down": {"uv": [12, 4, 16, 16], "texture": "#s"} "down": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -23,11 +23,11 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 16, 16], "texture": "#s"},
"east": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "east": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [0, 0.5, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "west": {"uv": [12, 0.5, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 12, 16, 16], "texture": "#s"}, "up": {"uv": [0, 12, 16, 16], "texture": "#s"},
"down": {"uv": [0, 0, 16, 4], "texture": "#s"} "down": {"uv": [0, 0, 16, 4], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -176,9 +176,9 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]},
"faces": { "faces": {
"north": {"uv": [4, 4.5, 16, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 16, 16], "texture": "#s"},
"west": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, "west": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 8, 12, 12], "texture": "#s"}, "up": {"uv": [0, 8, 12, 12], "texture": "#s"},
"down": {"uv": [0, 4, 12, 8], "texture": "#s"} "down": {"uv": [0, 4, 12, 8], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -187,9 +187,9 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 16, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 16, 16], "texture": "#s"},
"west": {"uv": [4, 8.5, 8, 16], "texture": "#s"}, "west": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 4, 8, 8], "texture": "#s"}, "up": {"uv": [0, 4, 8, 8], "texture": "#s"},
"down": {"uv": [0, 8, 8, 12], "texture": "#s"} "down": {"uv": [0, 8, 8, 12], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -197,10 +197,10 @@
"to": [12, 11.5, 8], "to": [12, 11.5, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 4.5, 8, 16], "texture": "#s"}, "west": {"uv": [0, 4.5, 8, 16], "texture": "#s"},
"up": {"uv": [8, 0, 12, 8], "texture": "#s"}, "up": {"uv": [8, 0, 12, 8], "texture": "#s"},
"down": {"uv": [8, 8, 12, 16], "texture": "#s"} "down": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -208,10 +208,10 @@
"to": [8, 7.5, 4], "to": [8, 7.5, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"},
"up": {"uv": [4, 0, 8, 4], "texture": "#s"}, "up": {"uv": [4, 0, 8, 4], "texture": "#s"},
"down": {"uv": [4, 12, 8, 16], "texture": "#s"} "down": {"uv": [4, 12, 8, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
@ -219,10 +219,10 @@
"to": [4, 4, 4], "to": [4, 4, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]},
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 12, 4, 16], "texture": "#s"}, "west": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 4], "texture": "#s"}, "up": {"uv": [0, 0, 4, 4], "texture": "#s"},
"down": {"uv": [0, 12, 4, 16], "texture": "#s"} "down": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {

20
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json
View file

@ -9,10 +9,10 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 3.5, 16], "to": [16, 3.5, 16],
"faces": { "faces": {
"north": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, "north": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, "east": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, "south": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, "west": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#s"}, "up": {"uv": [0, 0, 16, 16], "texture": "#s"},
"down": {"uv": [0, 0, 16, 16], "texture": "#s"} "down": {"uv": [0, 0, 16, 16], "texture": "#s"}
} }
@ -23,8 +23,8 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"}, "north": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"},
"east": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"}, "east": {"uv": [0, 8.5, 12, 12.5], "texture": "#s", "cullface": "east"},
"south": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"}, "south": {"uv": [4, 8.5, 16, 12.5], "texture": "#s", "cullface": "south"},
"west": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"}, "west": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"},
"up": {"uv": [4, 4, 16, 16], "texture": "#s"}, "up": {"uv": [4, 4, 16, 16], "texture": "#s"},
"down": {"uv": [4, 0, 16, 12], "texture": "#s"} "down": {"uv": [4, 0, 16, 12], "texture": "#s"}
@ -35,8 +35,8 @@
"to": [16, 11.5, 16], "to": [16, 11.5, 16],
"faces": { "faces": {
"north": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"}, "north": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"},
"east": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"}, "east": {"uv": [0, 4.5, 8, 8.5], "texture": "#s", "cullface": "east"},
"south": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"}, "south": {"uv": [8, 4.5, 16, 8.5], "texture": "#s", "cullface": "south"},
"west": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"}, "west": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"},
"up": {"uv": [8, 8, 16, 16], "texture": "#s"} "up": {"uv": [8, 8, 16, 16], "texture": "#s"}
} }
@ -47,8 +47,8 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"},
"east": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"}, "east": {"uv": [0, 0.5, 4, 4.5], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 4.5], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"}, "west": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"},
"up": {"uv": [12, 12, 16, 16], "texture": "#s"} "up": {"uv": [12, 12, 16, 16], "texture": "#s"}
} }

73
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json
View file

@ -1,5 +1,5 @@
{ {
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"particle": "engineersdecor:block/roof/dark_shingle_roof", "particle": "engineersdecor:block/roof/dark_shingle_roof",
"s": "engineersdecor:block/roof/dark_shingle_roof" "s": "engineersdecor:block/roof/dark_shingle_roof"
@ -9,47 +9,74 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [4, 3.5, 16], "to": [4, 3.5, 16],
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [0, 12, 4, 16], "texture": "#s"}, "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 12, 16, 16], "texture": "#s"}, "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 16], "texture": "#s"}, "up": {"uv": [0, 0, 4, 16], "texture": "#s"},
"down": {"uv": [0, 0, 4, 16], "texture": "#s"} "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"}
} }
}, },
{ {
"from": [4, 0, 0], "from": [4, 0, 0],
"to": [8, 4, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [8, 12, 12, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [4, 12, 8, 16], "texture": "#s", "cullface": "south"},
"down": {"uv": [4, 0, 8, 16], "texture": "#s", "cullface": "down"}
}
},
{
"from": [4, 4, 0],
"to": [8, 7.5, 16], "to": [8, 7.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 12, 12], "texture": "#s", "cullface": "north"},
"south": {"uv": [4, 8, 8, 16], "texture": "#s"}, "south": {"uv": [4, 8.5, 8, 12], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 8, 16, 16], "texture": "#s"}, "west": {"uv": [0, 8.5, 16, 12], "texture": "#s"},
"up": {"uv": [4, 0, 8, 16], "texture": "#s"}, "up": {"uv": [4, 0, 8, 16], "texture": "#s"}
"down": {"uv": [4, 0, 8, 16], "texture": "#s"}
} }
}, },
{ {
"from": [8, 0, 0], "from": [8, 0, 0],
"to": [12, 8, 16],
"faces": {
"north": {"uv": [4, 8, 8, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "south"},
"down": {"uv": [8, 0, 12, 16], "texture": "#s", "cullface": "down"}
}
},
{
"from": [8, 8, 0],
"to": [12, 11.5, 16], "to": [12, 11.5, 16],
"faces": { "faces": {
"north": {"uv": [4, 4, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 8], "texture": "#s", "cullface": "north"},
"south": {"uv": [8, 4, 12, 16], "texture": "#s"}, "south": {"uv": [8, 4.5, 12, 8], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 4, 16, 16], "texture": "#s"}, "west": {"uv": [0, 4.5, 16, 8], "texture": "#s"},
"up": {"uv": [8, 0, 12, 16], "texture": "#s"}, "up": {"uv": [8, 0, 12, 16], "texture": "#s"}
"down": {"uv": [8, 0, 12, 16], "texture": "#s"} }
},
{
"from": [12, 12, 0],
"to": [16, 15.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "north"},
"east": {"uv": [0, 0.5, 16, 4], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 0.5, 16, 4], "texture": "#s"},
"up": {"uv": [12, 0, 16, 16], "texture": "#s"}
} }
}, },
{ {
"from": [12, 0, 0], "from": [12, 0, 0],
"to": [16, 15.5, 16], "to": [16, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 4, 16], "texture": "#s"}, "north": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#s"}, "east": {"uv": [0, 4, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0, 16, 16], "texture": "#s"}, "south": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#s"}, "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"}
"up": {"uv": [12, 0, 16, 16], "texture": "#s"},
"down": {"uv": [12, 0, 16, 16], "texture": "#s"}
} }
}, },
{ {

24
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json
View file

@ -1,5 +1,5 @@
{ {
"textures": { "textures": {
"particle": "engineersdecor:block/roof/dark_shingle_roof", "particle": "engineersdecor:block/roof/dark_shingle_roof",
"s": "engineersdecor:block/roof/dark_shingle_roof" "s": "engineersdecor:block/roof/dark_shingle_roof"
}, },
@ -8,8 +8,8 @@
"from": [12, 0, 0], "from": [12, 0, 0],
"to": [16, 15.5, 12], "to": [16, 15.5, 12],
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [4, 0.5, 16, 16], "texture": "#s"}, "east": {"uv": [4, 0.5, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"},
"west": {"uv": [0, 0.5, 12, 16], "texture": "#s"}, "west": {"uv": [0, 0.5, 12, 16], "texture": "#s"},
"up": {"uv": [12, 0, 16, 12], "texture": "#s"}, "up": {"uv": [12, 0, 16, 12], "texture": "#s"},
@ -22,9 +22,9 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 16, 16], "texture": "#s"},
"east": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "east": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [0, 0.5, 16, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "west": {"uv": [12, 0.5, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 12, 16, 16], "texture": "#s"}, "up": {"uv": [0, 12, 16, 16], "texture": "#s"},
"down": {"uv": [0, 0, 16, 4], "texture": "#s"} "down": {"uv": [0, 0, 16, 4], "texture": "#s"}
} }
@ -175,7 +175,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]},
"faces": { "faces": {
"north": {"uv": [4, 4.5, 16, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 16, 16], "texture": "#s"},
"west": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, "west": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 8, 12, 12], "texture": "#s"}, "up": {"uv": [0, 8, 12, 12], "texture": "#s"},
"down": {"uv": [0, 4, 12, 8], "texture": "#s"} "down": {"uv": [0, 4, 12, 8], "texture": "#s"}
} }
@ -186,7 +186,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 16, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 16, 16], "texture": "#s"},
"west": {"uv": [4, 8.5, 8, 16], "texture": "#s"}, "west": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 4, 8, 8], "texture": "#s"}, "up": {"uv": [0, 4, 8, 8], "texture": "#s"},
"down": {"uv": [0, 8, 8, 12], "texture": "#s"} "down": {"uv": [0, 8, 8, 12], "texture": "#s"}
} }
@ -196,7 +196,7 @@
"to": [12, 11.5, 8], "to": [12, 11.5, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 4.5, 8, 16], "texture": "#s"}, "west": {"uv": [0, 4.5, 8, 16], "texture": "#s"},
"up": {"uv": [8, 0, 12, 8], "texture": "#s"}, "up": {"uv": [8, 0, 12, 8], "texture": "#s"},
"down": {"uv": [8, 8, 12, 16], "texture": "#s"} "down": {"uv": [8, 8, 12, 16], "texture": "#s"}
@ -207,7 +207,7 @@
"to": [8, 7.5, 4], "to": [8, 7.5, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"},
"up": {"uv": [4, 0, 8, 4], "texture": "#s"}, "up": {"uv": [4, 0, 8, 4], "texture": "#s"},
"down": {"uv": [4, 12, 8, 16], "texture": "#s"} "down": {"uv": [4, 12, 8, 16], "texture": "#s"}
@ -218,8 +218,8 @@
"to": [4, 4, 4], "to": [4, 4, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]},
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"west": {"uv": [0, 12, 4, 16], "texture": "#s"}, "west": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 4], "texture": "#s"}, "up": {"uv": [0, 0, 4, 4], "texture": "#s"},
"down": {"uv": [0, 12, 4, 16], "texture": "#s"} "down": {"uv": [0, 12, 4, 16], "texture": "#s"}
} }

73
src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json
View file

@ -1,5 +1,5 @@
{ {
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"2": "engineersdecor:block/material/steel_texture", "2": "engineersdecor:block/material/steel_texture",
"particle": "engineersdecor:block/roof/dark_shingle_roof", "particle": "engineersdecor:block/roof/dark_shingle_roof",
@ -11,9 +11,9 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [4, 3.5, 16], "to": [4, 3.5, 16],
"faces": { "faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#s"}, "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [0, 12, 4, 16], "texture": "#s"}, "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [0, 12, 16, 16], "texture": "#s"}, "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"},
"up": {"uv": [0, 0, 4, 16], "texture": "#s"}, "up": {"uv": [0, 0, 4, 16], "texture": "#s"},
"down": {"uv": [0, 0, 4, 16], "texture": "#s"} "down": {"uv": [0, 0, 4, 16], "texture": "#s"}
} }
@ -24,7 +24,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 12, 16], "texture": "#s"},
"south": {"uv": [4, 8.5, 8, 16], "texture": "#s"}, "south": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 8.5, 16, 16], "texture": "#s"}, "west": {"uv": [12, 8.5, 16, 16], "texture": "#s"},
"up": {"uv": [4, 12, 8, 16], "texture": "#s"}, "up": {"uv": [4, 12, 8, 16], "texture": "#s"},
"down": {"uv": [4, 0, 8, 4], "texture": "#s"} "down": {"uv": [4, 0, 8, 4], "texture": "#s"}
@ -35,7 +35,7 @@
"to": [8, 7.5, 4], "to": [8, 7.5, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -4]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -4]},
"faces": { "faces": {
"north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [4, 8.5, 8, 16], "texture": "#s"}, "south": {"uv": [4, 8.5, 8, 16], "texture": "#s"},
"west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"},
"up": {"uv": [4, 0, 8, 4], "texture": "#s"}, "up": {"uv": [4, 0, 8, 4], "texture": "#s"},
@ -47,7 +47,7 @@
"to": [12, 11.5, 16], "to": [12, 11.5, 16],
"faces": { "faces": {
"north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 16], "texture": "#s"},
"south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, "south": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 4.5, 16, 16], "texture": "#s"}, "west": {"uv": [12, 4.5, 16, 16], "texture": "#s"},
"up": {"uv": [8, 12, 12, 16], "texture": "#s"}, "up": {"uv": [8, 12, 12, 16], "texture": "#s"},
"down": {"uv": [8, 0, 12, 4], "texture": "#s"} "down": {"uv": [8, 0, 12, 4], "texture": "#s"}
@ -58,7 +58,7 @@
"to": [12, 11.5, 4], "to": [12, 11.5, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -4]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -4]},
"faces": { "faces": {
"north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"},
"south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, "south": {"uv": [8, 4.5, 12, 16], "texture": "#s"},
"west": {"uv": [0, 4.5, 4, 16], "texture": "#s"}, "west": {"uv": [0, 4.5, 4, 16], "texture": "#s"},
"up": {"uv": [8, 0, 12, 4], "texture": "#s"}, "up": {"uv": [8, 0, 12, 4], "texture": "#s"},
@ -67,15 +67,25 @@
}, },
{ {
"from": [12, 0, 0], "from": [12, 0, 0],
"to": [16, 12, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "north"},
"east": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 4, 16, 16], "texture": "#s"},
"down": {"uv": [12, 12, 16, 16], "texture": "#s"}
}
},
{
"from": [12, 12, 0],
"to": [16, 15.5, 4], "to": [16, 15.5, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "north"},
"east": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "east": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 4], "texture": "#s"},
"west": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "west": {"uv": [0, 0.5, 4, 4], "texture": "#s"},
"up": {"uv": [12, 0, 16, 4], "texture": "#s"}, "up": {"uv": [12, 0, 16, 4], "texture": "#s"}
"down": {"uv": [12, 12, 16, 16], "texture": "#s"}
} }
}, },
{ {
@ -83,12 +93,10 @@
"to": [16, 4.5, 12], "to": [16, 4.5, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]},
"faces": { "faces": {
"north": {"uv": [8, 12, 12, 16], "texture": "#s"}, "east": {"uv": [4, 11.5, 12, 16], "texture": "#s", "cullface": "east"},
"east": {"uv": [4, 12, 12, 16], "texture": "#s"}, "west": {"uv": [4, 11.5, 12, 16], "texture": "#s"},
"south": {"uv": [4, 12, 8, 16], "texture": "#s"}, "up": {"uv": [4, 4, 16, 12], "texture": "#s"},
"west": {"uv": [4, 12, 12, 16], "texture": "#s"}, "down": {"uv": [4, 4, 16, 12], "texture": "#s"}
"up": {"uv": [4, 4, 8, 12], "texture": "#s"},
"down": {"uv": [4, 4, 8, 12], "texture": "#s"}
} }
}, },
{ {
@ -113,7 +121,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 12]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 12]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 4.25], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 4.25], "texture": "#s"},
"east": {"uv": [4, 0.5, 12, 4.25], "texture": "#s"}, "east": {"uv": [4, 0.5, 12, 4.25], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 4.25], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 4.25], "texture": "#s"},
"west": {"uv": [4, 0.5, 12, 4.25], "texture": "#s"}, "west": {"uv": [4, 0.5, 12, 4.25], "texture": "#s"},
"up": {"uv": [12, 4, 16, 12], "texture": "#s"}, "up": {"uv": [12, 4, 16, 12], "texture": "#s"},
@ -122,15 +130,25 @@
}, },
{ {
"from": [12, 0, 12], "from": [12, 0, 12],
"to": [16, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 4, 4, 16], "texture": "#s"},
"east": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "south"},
"down": {"uv": [12, 0, 16, 4], "texture": "#s"}
}
},
{
"from": [12, 12, 12],
"to": [16, 15.5, 16], "to": [16, 15.5, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "north": {"uv": [0, 0.5, 4, 4], "texture": "#s"},
"east": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, "east": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "east"},
"south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "south": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "south"},
"west": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, "west": {"uv": [12, 0.5, 16, 4], "texture": "#s"},
"up": {"uv": [12, 12, 16, 16], "texture": "#s"}, "up": {"uv": [12, 12, 16, 16], "texture": "#s"}
"down": {"uv": [12, 0, 16, 4], "texture": "#s"}
} }
}, },
{ {
@ -372,7 +390,6 @@
"faces": { "faces": {
"north": {"uv": [0, 0, 1, 7], "texture": "#2"}, "north": {"uv": [0, 0, 1, 7], "texture": "#2"},
"east": {"uv": [0, 0, 1, 7], "texture": "#2"}, "east": {"uv": [0, 0, 1, 7], "texture": "#2"},
"south": {"uv": [0, 0, 1, 7], "texture": "#2"},
"west": {"uv": [0, 0, 1, 7], "texture": "#2"}, "west": {"uv": [0, 0, 1, 7], "texture": "#2"},
"up": {"uv": [0, 0, 1, 1], "texture": "#2"}, "up": {"uv": [0, 0, 1, 1], "texture": "#2"},
"down": {"uv": [0, 0, 1, 1], "texture": "#2"} "down": {"uv": [0, 0, 1, 1], "texture": "#2"}

1
src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/book.json
View file

@ -5,5 +5,6 @@
"version": 0, "version": 0,
"model": "engineersdecor:manual", "model": "engineersdecor:manual",
"show_progress": false, "show_progress": false,
"show_toasts": false,
"landing_text": "Tip in advance: To get a short tooltip help text for a block or device, press the CONTRTOL and SHIFT keys at the same time while hovering. That way you do not need to carry this heavy manual with you all the time. The more detailed descriptions in this book are helpful if the features are new for you, or if you like to read up about background aspects." "landing_text": "Tip in advance: To get a short tooltip help text for a block or device, press the CONTRTOL and SHIFT keys at the same time while hovering. That way you do not need to carry this heavy manual with you all the time. The more detailed descriptions in this book are helpful if the features are new for you, or if you like to read up about background aspects."
} }