From 3fbacddf3cc6613b1a1f7fbea167e74e0f81406c Mon Sep 17 00:00:00 2001
From: Frank Bauer <developer@ambertation.de>
Date: Thu, 24 Jun 2021 18:54:22 +0200
Subject: [PATCH] Smaller UI updates

---
 .../client/gui/EndStoneSmelterScreen.java         | 15 +++++++++------
 .../client/gui/EndStoneSmelterScreenHandler.java  |  5 +++++
 .../client/gui/slot/SmelterOutputSlot.java        |  3 +--
 .../ru/betterend/item/tool/EndHammerItem.java     |  4 +++-
 .../world/surface/SulphuricSurfaceBuilder.java    | 10 +++++-----
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java
index c030ed9f..a7f66c33 100644
--- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java
+++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java
@@ -32,13 +32,14 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 	
 	public void init() {
 		super.init();
+		//TODO: test in 1.17
 		narrow = width < 379;
 		recipeBook.init(width, height, minecraft, narrow, menu);
-		leftPos = recipeBook.updateScreenPosition(narrow, width, imageWidth);
-		addButton(new ImageButton(leftPos + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> {
-			recipeBook.initVisuals(narrow);
+		leftPos = recipeBook.updateScreenPosition(width, imageWidth);
+		addRenderableWidget(new ImageButton(leftPos + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> {
+			recipeBook.initVisuals();
 			recipeBook.toggleVisibility();
-			leftPos = recipeBook.updateScreenPosition(narrow, width, imageWidth);
+			leftPos = recipeBook.updateScreenPosition( width, imageWidth);
 			((ImageButton) buttonWidget).setPosition(leftPos + 20, height / 2 - 49);
 		}));
 		titleLabelX = (imageWidth - font.width(title)) / 2;
@@ -109,8 +110,10 @@ public class EndStoneSmelterScreen extends AbstractContainerScreen<EndStoneSmelt
 	@Override
 	protected void renderBg(PoseStack matrices, float delta, int mouseX, int mouseY) {
 		if (minecraft == null) return;
-		RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-		minecraft.getTextureManager().bind(BACKGROUND_TEXTURE);
+		//TODO: verify
+		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+		RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE);
+		//minecraft.getTextureManager().bind(BACKGROUND_TEXTURE);
 		blit(matrices, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 		int progress;
 		if (menu.isBurning()) {
diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java
index e2c98053..e8a348ca 100644
--- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java
+++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java
@@ -107,6 +107,11 @@ public class EndStoneSmelterScreenHandler extends RecipeBookMenu<Container> {
 		return RecipeBookType.BLAST_FURNACE;
 	}
 
+	@Override
+	public boolean shouldMoveToInventory(int i) {
+		return i != this.getResultSlotIndex();
+	}
+
 	@Override
 	public boolean stillValid(Player player) {
 		return inventory.stillValid(player);
diff --git a/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java b/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java
index 212eb179..3b4d0edc 100644
--- a/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java
+++ b/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java
@@ -28,10 +28,9 @@ public class SmelterOutputSlot extends Slot {
 		return super.remove(amount);
 	}
 
-	public ItemStack onTake(Player player, ItemStack stack) {
+	public void onTake(Player player, ItemStack stack) {
 		this.checkTakeAchievements(stack);
 		super.onTake(player, stack);
-		return stack;
 	}
 
 	protected void onQuickCraft(ItemStack stack, int amount) {
diff --git a/src/main/java/ru/betterend/item/tool/EndHammerItem.java b/src/main/java/ru/betterend/item/tool/EndHammerItem.java
index 0cef9ded..93e21ace 100644
--- a/src/main/java/ru/betterend/item/tool/EndHammerItem.java
+++ b/src/main/java/ru/betterend/item/tool/EndHammerItem.java
@@ -14,6 +14,7 @@ import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.Tag;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -40,7 +41,8 @@ public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, I
 	private final Multimap<Attribute, AttributeModifier> attributeModifiers;
 
 	public EndHammerItem(Tier material, float attackDamage, float attackSpeed, double knockback, Properties settings) {
-		super(attackDamage, attackSpeed, material, Sets.newHashSet(), settings);
+		//we override all methods that access BlockTags.MINEABLE_WITH_PICKAXE in the superclass, so this should not matter
+		super(attackDamage, attackSpeed, material, BlockTags.MINEABLE_WITH_PICKAXE, settings);
 
 		Builder<Attribute, AttributeModifier> builder = ImmutableMultimap.builder();
 		builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Weapon modifier", attackDamage + material.getAttackDamageBonus(), AttributeModifier.Operation.ADDITION));
diff --git a/src/main/java/ru/betterend/world/surface/SulphuricSurfaceBuilder.java b/src/main/java/ru/betterend/world/surface/SulphuricSurfaceBuilder.java
index 90841b95..59c2742e 100644
--- a/src/main/java/ru/betterend/world/surface/SulphuricSurfaceBuilder.java
+++ b/src/main/java/ru/betterend/world/surface/SulphuricSurfaceBuilder.java
@@ -19,19 +19,19 @@ public class SulphuricSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseCo
 	}
 
 	@Override
-	public void apply(Random random, ChunkAccess chunk, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderBaseConfiguration surfaceBlocks) {
+	public void apply(Random random, ChunkAccess chunk, Biome biome, int x, int z, int height, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, int seed, long n, SurfaceBuilderBaseConfiguration surfaceBlocks){
 		double value = NOISE.eval(x * 0.03, z * 0.03) + NOISE.eval(x * 0.1, z * 0.1) * 0.3 + MHelper.randRange(-0.1, 0.1, MHelper.RANDOM);
 		if (value < -0.6) {
-			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.DEFAULT_END_CONFIG);
+			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, n, SurfaceBuilders.DEFAULT_END_CONFIG);
 		}
 		else if (value < -0.3) {
-			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.FLAVOLITE_CONFIG);
+			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, n, SurfaceBuilders.FLAVOLITE_CONFIG);
 		}
 		else if (value < 0.5) {
-			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.SULFURIC_ROCK_CONFIG);
+			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, n, SurfaceBuilders.SULFURIC_ROCK_CONFIG);
 		}
 		else {
-			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, SurfaceBuilders.BRIMSTONE_CONFIG);
+			SurfaceBuilder.DEFAULT.apply(random, chunk, biome, x, z, height, noise, defaultBlock, defaultFluid, seaLevel, seed, n, SurfaceBuilders.BRIMSTONE_CONFIG);
 		}
 	}