maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish 1.17.1 port

Browse source
This commit is contained in:
modmuss50 2021-07-20 19:01:38 +01:00
parent 08a2cdb081
commit 2ae5e8ff5b
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -149,10 +149,10 @@ dependencies {
api project(":RebornCore")
include project(":RebornCore")
optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.262-alpha"
optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.264-alpha"
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.7')
disabledOptionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT"
optionalDependency 'net.oskarstrom:DashLoader:2.0'
disabledOptionalDependency 'net.oskarstrom:DashLoader:2.0'
}

2
src/main/java/techreborn/client/gui/GuiIronFurnace.java
View file

@ -91,7 +91,7 @@ public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
List<Text> list = new ArrayList<>();
list.add(new LiteralText(message));
renderTooltip(matrixStack, list, mouseX, mouseY);
GuiIronFurnace.this.renderTooltip(matrixStack, list, mouseX, mouseY);
RenderSystem.setShaderColor(1, 1, 1, 1);
}

10
src/main/java/techreborn/client/gui/GuiManual.java
View file

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

2
src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
View file

@ -38,7 +38,7 @@ public class DynamicBucketBakedModel extends BaseDynamicFluidBakedModel {
private static final ModelIdentifier BUCKET_FLUID = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_fluid"), "inventory");
@Override
public Sprite getSprite() {
public Sprite getParticleSprite() {
return MinecraftClient.getInstance()
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
.apply(new Identifier("minecraft:item/bucket"));

2
src/main/java/techreborn/client/render/DynamicCellBakedModel.java
View file

@ -53,7 +53,7 @@ public class DynamicCellBakedModel extends BaseDynamicFluidBakedModel {
}
@Override
public Sprite getSprite() {
public Sprite getParticleSprite() {
return MinecraftClient.getInstance()
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
.apply(new Identifier("techreborn:item/cell_base"));

2
src/main/java/techreborn/items/ManualItem.java
View file

@ -51,6 +51,6 @@ public class ManualItem extends Item {
@Environment(EnvType.CLIENT)
private void openGui() {
MinecraftClient.getInstance().openScreen(new GuiManual());
MinecraftClient.getInstance().setScreen(new GuiManual());
}
}

2
src/main/java/techreborn/world/RubberSaplingGenerator.java
View file

@ -41,7 +41,7 @@ public class RubberSaplingGenerator extends SaplingGenerator {
@Nullable
@Override
protected ConfiguredFeature<TreeFeatureConfig, ?> createTreeFeature(Random random, boolean bl) {
protected ConfiguredFeature<TreeFeatureConfig, ?> getTreeFeature(Random random, boolean bl) {
MutableRegistry<ConfiguredFeature<?, ?>> registry = WorldGenerator.worldGenObseravable.getA();
if (!registry.getIds().contains(IDENTIFIER)) {
LOGGER.debug("Rubber tree feature not found. Are you in the rendering thread?");