diff --git a/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java b/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java index 6782269d..d7f73605 100644 --- a/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java +++ b/src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java @@ -18,11 +18,14 @@ import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; import ru.betterend.recipe.builders.InfusionRecipe; import ru.betterend.registry.EndBlocks; import ru.betterend.util.LangUtil; public class REIInfusionCategory implements TransferRecipeCategory { + + private final static Identifier COMPASS_IMG = BetterEnd.makeID("textures/gui/compass.png"); @Override public @NotNull Identifier getIdentifier() { @@ -46,11 +49,13 @@ public class REIInfusionCategory implements TransferRecipeCategory setupDisplay(REIInfusionDisplay display, Rectangle bounds) { - Point centerPoint = new Point(bounds.getCenterX() - 36, bounds.getCenterY() - 4); + Point centerPoint = new Point(bounds.getCenterX() - 34, bounds.getCenterY() - 6); List widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); List> inputEntries = display.getInputEntries(); List> outputEntries = display.getResultingEntries(); + widgets.add(Widgets.createArrow(new Point(centerPoint.x + 48, centerPoint.y))); + widgets.add(Widgets.createTexturedWidget(COMPASS_IMG, centerPoint.x - 40, centerPoint.y - 40, 0.0F, 0.0F, 96, 96, 512, 512, 512, 512)); widgets.add(Widgets.createSlot(centerPoint).entries(inputEntries.get(0)).markInput()); widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y - 28)).entries(inputEntries.get(1)).markInput()); widgets.add(Widgets.createSlot(new Point(centerPoint.x + 28, centerPoint.y)).entries(inputEntries.get(3)).markInput()); @@ -60,7 +65,6 @@ public class REIInfusionCategory implements TransferRecipeCategory { this.rightBoot.addCuboid(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.25F); this.rightBoot.setPivot(-1.9F, 12.0F, 0.0F); } + + @Override + public void setAttributes(BipedEntityModel bipedEntityModel) { + super.setAttributes(bipedEntityModel); + this.leftBoot.copyPositionAndRotation(leftLeg); + this.rightBoot.copyPositionAndRotation(rightLeg); + } @Override protected Iterable getHeadParts() { @@ -33,12 +40,4 @@ public class CrystaliteBootsModel extends BipedEntityModel { protected Iterable getBodyParts() { return Lists.newArrayList(leftBoot, rightBoot); } - - @Override - public void setAttributes(BipedEntityModel bipedEntityModel) { - this.leftLeg.copyPositionAndRotation(bipedEntityModel.leftLeg); - this.rightLeg.copyPositionAndRotation(bipedEntityModel.rightLeg); - this.leftBoot.copyPositionAndRotation(leftLeg); - this.rightBoot.copyPositionAndRotation(rightLeg); - } } diff --git a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java index 8aa25464..5a08f9d0 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java @@ -25,23 +25,30 @@ public class CrystaliteChestplateModel extends BipedEntityModel { this.torso.setPivot(0.0F, 0.0F, 0.0F); if (thinArms) { this.leftShoulder = new ModelPart(this, 41, 32); - this.leftShoulder.addCuboid(-1.0F, -2.5F, -2.0F, 3.0F, 12.0F, 4.0F, scale + 0.3F); + this.leftShoulder.addCuboid(-1.0F, -2.5F, -2.0F, 3.0F, 12.0F, 4.0F, scale + 0.35F); this.leftShoulder.setPivot(5.0F, 2.5F, 0.0F); this.leftShoulder.mirror = true; this.rightShoulder = new ModelPart(this, 41, 16); - this.rightShoulder.addCuboid(-2.0F, -2.5F, -2.0F, 3.0F, 12.0F, 4.0F, scale + 0.3F); + this.rightShoulder.addCuboid(-2.0F, -2.5F, -2.0F, 3.0F, 12.0F, 4.0F, scale + 0.35F); this.rightShoulder.setPivot(-5.0F, 2.5F, 10.0F); } else { this.leftShoulder = new ModelPart(this, 40, 32); - this.leftShoulder.addCuboid(-1.0F, -2.5F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.4F); + this.leftShoulder.addCuboid(-1.0F, -2.5F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.45F); this.leftShoulder.setPivot(5.0F, 2.0F, 0.0F); this.leftShoulder.mirror = true; this.rightShoulder = new ModelPart(this, 40, 16); - this.rightShoulder.addCuboid(-3.0F, -2.5F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.4F); + this.rightShoulder.addCuboid(-3.0F, -2.5F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.45F); this.rightShoulder.setPivot(-5.0F, 2.0F, 10.0F); } } + @Override + public void setAttributes(BipedEntityModel bipedEntityModel) { + super.setAttributes(bipedEntityModel); + this.leftShoulder.copyPositionAndRotation(leftArm); + this.rightShoulder.copyPositionAndRotation(rightArm); + } + @Override protected Iterable getHeadParts() { return Collections::emptyIterator; @@ -52,15 +59,6 @@ public class CrystaliteChestplateModel extends BipedEntityModel { return Lists.newArrayList(torso, leftShoulder, rightShoulder); } - @Override - public void setAttributes(BipedEntityModel bipedEntityModel) { - this.torso.copyPositionAndRotation(bipedEntityModel.torso); - this.leftArm.copyPositionAndRotation(bipedEntityModel.leftArm); - this.rightArm.copyPositionAndRotation(bipedEntityModel.rightArm); - this.leftShoulder.copyPositionAndRotation(leftArm); - this.rightShoulder.copyPositionAndRotation(rightArm); - } - @Override public void setArmAngle(Arm arm, MatrixStack matrices) { ModelPart modelPart = this.getArm(arm); diff --git a/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java b/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java index 7b19e079..ea5d80fe 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteLeggingsModel.java @@ -11,13 +11,11 @@ import net.minecraft.entity.LivingEntity; public class CrystaliteLeggingsModel extends BipedEntityModel { - public ModelPart jacket; - public CrystaliteLeggingsModel(float scale) { super(RenderLayer::getEntityTranslucent, scale, 0.0F, 64, 48); - this.jacket = new ModelPart(this, 16, 16); - this.jacket.addCuboid(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, scale); - this.jacket.setPivot(0.0F, 0.0F, 0.0F); + this.torso = new ModelPart(this, 16, 16); + this.torso.addCuboid(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, scale); + this.torso.setPivot(0.0F, 0.0F, 0.0F); this.leftLeg = new ModelPart(this, 0, 32); this.leftLeg.addCuboid(-2.0F, 0.0F, -2.0F, 4.0F, 12.0F, 4.0F, scale); this.leftLeg.setPivot(1.9F, 12.0F, 0.0F); @@ -33,12 +31,6 @@ public class CrystaliteLeggingsModel extends BipedEntityModel { @Override protected Iterable getBodyParts() { - return Lists.newArrayList(jacket, rightLeg, leftLeg); - } - - @Override - public void setAngles(LivingEntity livingEntity, float f, float g, float h, float i, float j) { - super.setAngles(livingEntity, f, g, h, i, j); - this.jacket.copyPositionAndRotation(torso); + return Lists.newArrayList(torso, rightLeg, leftLeg); } } diff --git a/src/main/resources/assets/betterend/textures/gui/compass.png b/src/main/resources/assets/betterend/textures/gui/compass.png new file mode 100644 index 00000000..89082a42 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/gui/compass.png differ