inital 19w46a port

This commit is contained in:
modmuss50 2019-11-14 18:37:42 +00:00
parent 3fe62e2c77
commit a984263b04
48 changed files with 356 additions and 339 deletions

View file

@ -143,7 +143,7 @@ public class GuiIndustrialSawmill extends GuiBase<BuiltContainer> {
this.blockEntity.getPos().getX()
- Direction.byId(this.blockEntity.getFacingInt()).getOffsetY() * 2,
this.blockEntity.getPos().getY() - 1, this.blockEntity.getPos().getZ()
- Direction.byId(this.blockEntity.getFacingInt()).getOffsetY() * 2).offset(blockEntity.getFacing().getOpposite(), 2);
- Direction.byId(this.blockEntity.getFacingInt()).getOffsetY() * 2).method_10079(blockEntity.getFacing().getOpposite(), 2);
}
} else {
RebornCoreClient.multiblockRenderEvent.setMultiblock(null);

View file

@ -30,7 +30,7 @@ import reborncore.common.util.StringUtils;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import net.minecraft.util.SystemUtil;
import net.minecraft.util.Util;
import reborncore.client.gui.builder.widget.GuiButtonExtended;
import reborncore.common.network.NetworkManager;
import techreborn.config.TechRebornConfig;
@ -60,7 +60,7 @@ public class GuiManual extends Screen {
y+= 40;
addButton(new GuiButtonExtended((width / 2 - 30), y + 10, 60, 20, StringUtils.t("techreborn.manual.wikibtn"), var1 -> minecraft.openScreen(new ConfirmChatLinkScreen(t -> {
if(t){
SystemUtil.getOperatingSystem().open("http://wiki.techreborn.ovh");
Util.getOperatingSystem().open("http://wiki.techreborn.ovh");
this.minecraft.openScreen(this);
} else {
this.minecraft.openScreen(this);
@ -68,7 +68,7 @@ public class GuiManual extends Screen {
}, "http://wiki.techreborn.ovh", false))));
addButton(new GuiButtonExtended((width / 2 - 30), y + 60, 60, 20, StringUtils.t("techreborn.manual.discordbtn"), var1 -> minecraft.openScreen(new ConfirmChatLinkScreen(t -> {
if(t){
SystemUtil.getOperatingSystem().open("https://discord.gg/teamreborn");
Util.getOperatingSystem().open("https://discord.gg/teamreborn");
this.minecraft.openScreen(this);
}else {
this.minecraft.openScreen(this);
@ -85,7 +85,7 @@ public class GuiManual extends Screen {
@Override
public void render(int mouseX, int mouseY, float partialTicks) {
renderBackground();
minecraft.getTextureManager().method_22813(GuiManual.texture);
minecraft.getTextureManager().bindTexture(GuiManual.texture);
int centerX = (width / 2) - guiWidth / 2;
int centerY = (height / 2) - guiHeight / 2;
blit(centerX, centerY, 0, 0, guiWidth, guiHeight);

View file

@ -27,6 +27,7 @@ package techreborn.client.gui;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import reborncore.RebornCoreClient;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
@ -129,7 +130,7 @@ public class GuiVacuumFreezer extends GuiBase<BuiltContainer> {
final MultiblockSet set = new MultiblockSet(multiblock);
RebornCoreClient.multiblockRenderEvent.setMultiblock(set);
RebornCoreClient.multiblockRenderEvent.parent = blockEntity.getPos();
MultiblockRenderEvent.anchor = blockEntity.getPos().down();
MultiblockRenderEvent.anchor = blockEntity.getPos().method_10079(Direction.DOWN, 1);
}
} else {
RebornCoreClient.multiblockRenderEvent.setMultiblock(null);

View file

@ -6,7 +6,7 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.fabricmc.indigo.renderer.helper.GeometryHelper;
import net.fabricmc.fabric.impl.client.indigo.renderer.helper.GeometryHelper;
import net.minecraft.block.BlockState;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.model.BakedModel;

View file

@ -24,15 +24,15 @@
package techreborn.client.render.entitys;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.block.BlockRenderManager;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.client.render.entity.TntMinecartEntityRenderer;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import techreborn.blocks.misc.BlockNuke;
import techreborn.entities.EntityNukePrimed;
import techreborn.init.TRContent;
@ -50,45 +50,27 @@ public class RenderNukePrimed extends EntityRenderer<EntityNukePrimed> {
@Nullable
@Override
protected Identifier getTexture(EntityNukePrimed entityNukePrimed) {
public Identifier getTexture(EntityNukePrimed entityNukePrimed) {
return SpriteAtlasTexture.BLOCK_ATLAS_TEX;
}
@Override
public void render(EntityNukePrimed entity, double x, double y, double z, float entityYaw, float partialTicks) {
BlockRenderManager blockrendererdispatcher = MinecraftClient.getInstance().getBlockRenderManager();
RenderSystem.pushMatrix();
RenderSystem.translatef((float) x, (float) y + 0.5F, (float) z);
if ((float) entity.getFuseTimer() - partialTicks + 1.0F < 10.0F) {
float f = 1.0F - ((float) entity.getFuseTimer() - partialTicks + 1.0F) / 10.0F;
f = MathHelper.clamp(f, 0.0F, 1.0F);
f = f * f;
f = f * f;
float f1 = 1.0F + f * 0.3F;
RenderSystem.scalef(f1, f1, f1);
public void render(EntityNukePrimed entity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) {
matrixStack.push();
matrixStack.translate(0.0D, 0.5D, 0.0D);
if ((float)entity.getFuseTimer() - g + 1.0F < 10.0F) {
float h = 1.0F - ((float)entity.getFuseTimer() - g + 1.0F) / 10.0F;
h = MathHelper.clamp(h, 0.0F, 1.0F);
h *= h;
h *= h;
float j = 1.0F + h * 0.3F;
matrixStack.scale(j, j, j);
}
this.bindEntityTexture(entity);
RenderSystem.translatef(-0.5F, -0.5F, 0.5F);
blockrendererdispatcher.renderDynamic(TRContent.NUKE.getDefaultState(),
entity.getBrightnessAtEyes());
RenderSystem.translatef(0.0F, 0.0F, 1.0F);
if (entity.getFuseTimer() / 5 % 2 == 0) {
RenderSystem.disableLighting();
RenderSystem.enableBlend();
RenderSystem.blendFunc(770, 772);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1F);
RenderSystem.polygonOffset(-3.0F, -3.0F);
RenderSystem.enablePolygonOffset();
blockrendererdispatcher.renderDynamic(
TRContent.NUKE.getDefaultState().with(BlockNuke.OVERLAY, true), 1.0F);
RenderSystem.polygonOffset(0.0F, 0.0F);
RenderSystem.disablePolygonOffset();
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.disableBlend();
RenderSystem.enableLighting();
}
RenderSystem.popMatrix();
super.render(entity, x, y, z, entityYaw, partialTicks);
}
matrixStack.multiply(Vector3f.POSITIVE_Y.getRotationQuaternion(-90.0F));
matrixStack.translate(-0.5D, -0.5D, 0.5D);
TntMinecartEntityRenderer.method_23190(TRContent.NUKE.getDefaultState(), matrixStack, vertexConsumerProvider, i, entity.getFuseTimer() / 5 % 2 == 0);
matrixStack.pop();
super.render(entity, f, g, matrixStack, vertexConsumerProvider, i);
}
}