1.17: TechReborn compiles and runs, big thanks to @petabyteboy

Co-authored-by: Milan Pässler <milan@petabyte.dev>
This commit is contained in:
modmuss50 2021-05-29 13:19:29 +01:00
parent c661de5254
commit b33f4be5f4
212 changed files with 952 additions and 2025 deletions

View file

@ -50,10 +50,10 @@ public class GuiAESU extends GuiBase<BuiltScreenHandler> {
@Override
public void init() {
super.init();
addButton(new GuiButtonUpDown(x + 121, y + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(x + 121 + 12, y + 79, this, b -> onClick(64), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(x + 121 + 24, y + 79, this, b -> onClick(-64), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(x + 121 + 36, y + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND));
addDrawableChild(new GuiButtonUpDown(x + 121, y + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD));
addDrawableChild(new GuiButtonUpDown(x + 121 + 12, y + 79, this, b -> onClick(64), UpDownButtonType.FORWARD));
addDrawableChild(new GuiButtonUpDown(x + 121 + 24, y + 79, this, b -> onClick(-64), UpDownButtonType.REWIND));
addDrawableChild(new GuiButtonUpDown(x + 121 + 36, y + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND));
}
@Override

View file

@ -49,12 +49,12 @@ public class GuiChunkLoader extends GuiBase<BuiltScreenHandler> {
public void init() {
super.init();
addButton(new GuiButtonUpDown(x + 64, y + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(x + 64 + 12, y + 40, this, b -> onClick(1), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(x + 64 + 24, y + 40, this, b -> onClick(-1), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(x + 64 + 36, y + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND));
addDrawableChild(new GuiButtonUpDown(x + 64, y + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD));
addDrawableChild(new GuiButtonUpDown(x + 64 + 12, y + 40, this, b -> onClick(1), UpDownButtonType.FORWARD));
addDrawableChild(new GuiButtonUpDown(x + 64 + 24, y + 40, this, b -> onClick(-1), UpDownButtonType.REWIND));
addDrawableChild(new GuiButtonUpDown(x + 64 + 36, y + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND));
addButton(new GuiButtonSimple(x + 10, y + 70, 155, 20, new LiteralText("Toggle Loaded Chunks"), b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos())));
addDrawableChild(new GuiButtonSimple(x + 10, y + 70, 155, 20, new LiteralText("Toggle Loaded Chunks"), b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos())));
}
@Override

View file

@ -56,10 +56,10 @@ public class GuiFusionReactor extends GuiBase<BuiltScreenHandler> {
@Override
public void init() {
super.init();
addButton(new GuiButtonUpDown(x + 121, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD));
addButton(new GuiButtonUpDown(x + 121 + 12, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD));
addButton(new GuiButtonUpDown(x + 121 + 24, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND));
addButton(new GuiButtonUpDown(x + 121 + 36, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND));
addDrawableChild(new GuiButtonUpDown(x + 121, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD));
addDrawableChild(new GuiButtonUpDown(x + 121 + 12, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD));
addDrawableChild(new GuiButtonUpDown(x + 121 + 24, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND));
addDrawableChild(new GuiButtonUpDown(x + 121 + 36, y + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND));
}
@Override

View file

@ -25,6 +25,7 @@
package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity;
@ -48,6 +49,7 @@ public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
IronFurnaceBlockEntity blockEntity;
public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) {
super(player, furnace, furnace.createScreenHandler(syncID, player));
this.blockEntity = furnace;
@ -60,14 +62,11 @@ public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
@Override
public void init() {
super.init();
addButton(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, LiteralText.EMPTY, b -> onClick()) {
addSelectableChild(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, LiteralText.EMPTY, b -> onClick()) {
@Override
public void renderToolTip(MatrixStack matrixStack, int mouseX, int mouseY) {
PlayerEntity player = playerInventory.player;
if (player == null) {
return;
}
PlayerEntity player = MinecraftClient.getInstance().player;
String message = "Experience: ";
float furnaceExp = blockEntity.experience;
@ -94,14 +93,13 @@ public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
List<Text> list = new ArrayList<>();
list.add(new LiteralText(message));
renderTooltip(matrixStack, list, mouseX, mouseY);
GlStateManager.disableLighting();
GlStateManager.color4f(1, 1, 1, 1);
RenderSystem.setShaderColor(1, 1, 1, 1);
}
@Override
public void renderBackground(MatrixStack matrixStack, MinecraftClient mc, int mouseX, int mouseY) {
mc.getItemRenderer().renderInGuiWithOverrides(new ItemStack(Items.EXPERIENCE_BOTTLE), x, y);
protected void renderBackground(MatrixStack matrices, MinecraftClient client, int mouseX, int mouseY) {
client.getItemRenderer().renderInGuiWithOverrides(new ItemStack(Items.EXPERIENCE_BOTTLE), x, y);
}
});
}

View file

@ -60,20 +60,20 @@ public class GuiManual extends Screen {
public void init() {
int y = (height / 2) - guiHeight / 2;
y += 40;
addButton(new GuiButtonExtended((width / 2 - 30), y + 10, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> {
addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 10, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> {
if (t) {
Util.getOperatingSystem().open("http://wiki.techreborn.ovh");
}
this.client.openScreen(this);
}, "http://wiki.techreborn.ovh", false))));
addButton(new GuiButtonExtended((width / 2 - 30), y + 60, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> {
addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 60, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> {
if (t) {
Util.getOperatingSystem().open("https://discord.gg/teamreborn");
}
this.client.openScreen(this);
}, "https://discord.gg/teamreborn", false))));
if (TechRebornConfig.allowManualRefund) {
addButton(new GuiButtonExtended((width / 2 - 30), y + 110, 60, 20, new TranslatableText("techreborn.manual.refundbtn"), var1 -> {
addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 110, 60, 20, new TranslatableText("techreborn.manual.refundbtn"), var1 -> {
NetworkManager.sendToServer(ServerboundPackets.createRefundPacket());
this.client.openScreen(null);
}));

View file

@ -31,18 +31,17 @@ import net.minecraft.client.render.RenderLayers;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.BlockRenderManager;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
import net.minecraft.client.util.math.MatrixStack;
import techreborn.blockentity.cable.CableBlockEntity;
import techreborn.blocks.cable.CableBlock;
import java.util.Random;
public class CableCoverRenderer extends BlockEntityRenderer<CableBlockEntity> {
public class CableCoverRenderer implements BlockEntityRenderer<CableBlockEntity> {
public CableCoverRenderer(BlockEntityRenderDispatcher dispatcher) {
super(dispatcher);
public CableCoverRenderer(BlockEntityRendererFactory.Context ctx) {
}
@Override

View file

@ -25,26 +25,25 @@
package techreborn.client.render.entitys;
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.EntityRendererFactory;
import net.minecraft.client.render.entity.TntMinecartEntityRenderer;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3f;
import org.jetbrains.annotations.Nullable;
import techreborn.entities.EntityNukePrimed;
import techreborn.init.TRContent;
import org.jetbrains.annotations.Nullable;
/**
* Created by Mark on 13/03/2016.
*/
public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
public NukeRenderer(EntityRenderDispatcher renderManager) {
super(renderManager);
public NukeRenderer(EntityRendererFactory.Context ctx) {
super(ctx);
this.shadowRadius = 0.5F;
}
@ -58,8 +57,8 @@ public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
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;
if ((float) entity.getFuse() - g + 1.0F < 10.0F) {
float h = 1.0F - ((float) entity.getFuse() - g + 1.0F) / 10.0F;
h = MathHelper.clamp(h, 0.0F, 1.0F);
h *= h;
h *= h;
@ -69,7 +68,7 @@ public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(-90.0F));
matrixStack.translate(-0.5D, -0.5D, 0.5D);
TntMinecartEntityRenderer.renderFlashingBlock(TRContent.NUKE.getDefaultState(), matrixStack, vertexConsumerProvider, i, entity.getFuseTimer() / 5 % 2 == 0);
TntMinecartEntityRenderer.renderFlashingBlock(TRContent.NUKE.getDefaultState(), matrixStack, vertexConsumerProvider, i, entity.getFuse() / 5 % 2 == 0);
matrixStack.pop();
super.render(entity, f, g, matrixStack, vertexConsumerProvider, i);
}

View file

@ -29,8 +29,8 @@ import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.item.ItemStack;
@ -41,9 +41,9 @@ import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity;
/**
* Created by drcrazy on 07-Jan-20 for TechReborn-1.15.
*/
public class StorageUnitRenderer extends BlockEntityRenderer<StorageUnitBaseBlockEntity> {
public StorageUnitRenderer(BlockEntityRenderDispatcher dispatcher) {
super(dispatcher);
public class StorageUnitRenderer implements BlockEntityRenderer<StorageUnitBaseBlockEntity> {
public StorageUnitRenderer(BlockEntityRendererFactory.Context ctx) {
}
@Override
@ -74,12 +74,12 @@ public class StorageUnitRenderer extends BlockEntityRenderer<StorageUnitBaseBloc
break;
}
int lightAbove = WorldRenderer.getLightmapCoordinates(storage.getWorld(), storage.getPos().offset(storage.getFacing()));
MinecraftClient.getInstance().getItemRenderer().renderItem(stack, ModelTransformation.Mode.FIXED, lightAbove, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers);
MinecraftClient.getInstance().getItemRenderer().renderItem(stack, ModelTransformation.Mode.FIXED, lightAbove, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers, 0);
matrices.pop();
// Text rendering
matrices.push();
TextRenderer textRenderer = this.dispatcher.getTextRenderer();
TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
Direction facing = storage.getFacing();
// Render item only on horizontal facing #2183

View file

@ -30,20 +30,23 @@ import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3f;
import techreborn.blockentity.generator.basic.WindMillBlockEntity;
public class TurbineRenderer extends BlockEntityRenderer<WindMillBlockEntity> {
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
public class TurbineRenderer implements BlockEntityRenderer<WindMillBlockEntity> {
private static final TurbineModel MODEL = new TurbineModel();
public static final Identifier TEXTURE = new Identifier("techreborn:textures/block/machines/generators/wind_mill_turbine.png");
public TurbineRenderer(BlockEntityRenderDispatcher dispatcher) {
super(dispatcher);
public TurbineRenderer(BlockEntityRendererFactory.Context ctx) {
}
@Override
@ -71,33 +74,40 @@ public class TurbineRenderer extends BlockEntityRenderer<WindMillBlockEntity> {
public TurbineModel() {
super(RenderLayer::getEntityCutoutNoCull);
textureWidth = 64;
textureHeight = 64;
base = new ModelPart(this);
ModelPart.Cuboid[] baseCuboids = {
new ModelPart.Cuboid(0, 0, -2.0F, -2.0F, -1.0F, 4F, 4F, 2F, 0F, 0F, 0F, false, 64F, 64F),
new ModelPart.Cuboid(0, 6, -1.0F, -1.0F, -2.0F, 2F, 2F, 1F, 0F, 0F, 0F, false, 64F, 64F)
};
base = new ModelPart(Arrays.asList(baseCuboids), new HashMap<String, ModelPart>() {
{
ModelPart.Cuboid[] blade1Cuboids = {
new ModelPart.Cuboid(0, 9, -24.0F, -1.0F, -0.5F, 24F, 2F, 1F, 0F, 0F, 0F, false, 64F, 64F)
};
ModelPart blade1 = new ModelPart(Arrays.asList(blade1Cuboids) , Collections.emptyMap());
blade1.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade1, -0.5236F, 0.0F, 0.0F);
put("blade1", blade1);
ModelPart.Cuboid[] blade2Cuboids = {
new ModelPart.Cuboid(0, 9, -24.0F, -1.0F, -0.5F, 24F, 2F, 1F, 0F, 0F, 0F, false, 64F, 64F)
};
ModelPart blade2 = new ModelPart(Arrays.asList(blade2Cuboids) , Collections.emptyMap());
blade2.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade2, -0.5236F, 0.0F, 2.0944F);
put("blade2", blade2);
ModelPart.Cuboid[] blade3Cuboids = {
new ModelPart.Cuboid(0, 9, -24.0F, -2.0F, -1.075F, 24F, 2F, 1F, 0F, 0F, 0F, false, 64F, 64F)
};
ModelPart blade3 = new ModelPart(Arrays.asList(blade3Cuboids) , Collections.emptyMap());
blade3.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade3, -0.5236F, 0.0F, -2.0944F);
put("blade3", blade3);
}
});
base.setPivot(0.0F, 24.0F, 0.0F);
base.addCuboid(null, -2.0F, -2.0F, -1.0F, 4, 4, 2, 0.0F, 0, 0);
base.addCuboid(null, -1.0F, -1.0F, -2.0F, 2, 2, 1, 0.0F, 0, 6);
ModelPart blade1 = new ModelPart(this);
blade1.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade1, -0.5236F, 0.0F, 0.0F);
blade1.addCuboid(null, -24.0F, -1.0F, -0.5F, 24, 2, 1, 0.0F, 0, 9);
ModelPart blade2 = new ModelPart(this);
blade2.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade2, -0.5236F, 0.0F, 2.0944F);
blade2.addCuboid(null, -24.0F, -1.0F, -0.5F, 24, 2, 1, 0.0F, 0, 9);
ModelPart blade3 = new ModelPart(this);
blade3.setPivot(0.0F, 0.0F, 0.0F);
setRotation(blade3, -0.5236F, 0.0F, -2.0944F);
blade3.addCuboid(null, -24.0F, -2.0F, -1.075F, 24, 2, 1, 0.0F, 0, 9);
base.addChild(blade1);
base.addChild(blade2);
base.addChild(blade3);
}
private void setRotation(ModelPart model, float x, float y, float z) {

View file

@ -56,12 +56,12 @@ public class DestructoPackScreenHandler extends ScreenHandler {
for (i = 0; i < 3; ++i) {
for (int j = 0; j < 9; ++j) {
this.addSlot(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
this.addSlot(new Slot(player.getInventory(), j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
}
}
for (i = 0; i < 9; ++i) {
this.addSlot(new Slot(player.inventory, i, 8 + i * 18, 142));
this.addSlot(new Slot(player.getInventory(), i, 8 + i * 18, 142));
}
}
}