diff --git a/gradle.properties b/gradle.properties index 68b91a8..2e47505 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.21 # Mod Properties - mod_version = 1.20.1.4 + mod_version = 1.20.1.5 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java index e3988aa..990f104 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java @@ -27,10 +27,12 @@ public class EmptyLavaHoarderBlockEntity extends BlockEntity { public static final void spawnRandomItems(World world, BlockPos pos, Integer count) { world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.DIAMOND, new Random().nextInt(count)))); world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.EMERALD, new Random().nextInt(count)))); - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.GOLD_NUGGET, new Random().nextInt(count)))); - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.IRON_NUGGET, new Random().nextInt(count)))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.GOLD_ORE, new Random().nextInt(count)))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.IRON_ORE, new Random().nextInt(count)))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.COPPER_ORE, new Random().nextInt(count)))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.OBSIDIAN, new Random().nextInt(count)))); world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.LAPIS_LAZULI, new Random().nextInt(count)))); - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.SULPHOR, 1 + new Random().nextInt(count)))); + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.SULPHOR, new Random().nextInt(count)))); } /** diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java index baaba02..ec1c6e8 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java @@ -11,10 +11,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; public class BackpackScreenHandler extends ScreenHandler { @@ -99,9 +96,6 @@ public class BackpackScreenHandler extends ScreenHandler { } else { super.onSlotClick(slotId, quickCraftData, actionType, playerEntity); } - } else if (playerEntity.getEntityWorld().isClient) { - playerEntity.getEntityWorld().playSound(null, BlockPos.ofFloored(playerEntity.getPos()), - SoundEvents.ENTITY_VILLAGER_NO, SoundCategory.PLAYERS, 1f, 1f); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java index 8c31c68..5a2cb42 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java @@ -40,10 +40,10 @@ public class BlockStackerScreen extends HandledScreen @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { - context.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); +// context.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); int guiX = (this.width - this.containerWidth) / 2; int guiY = (this.height - this.containerHeight) / 2; - context.drawTexture(TEXTURE, guiX, guiY, 0, 0, containerWidth, containerHeight); super.renderBackground(context); + context.drawTexture(TEXTURE, guiX, guiY, 0, 0, containerWidth, containerHeight); } } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 7814c4d..cfc864c 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -64,12 +64,12 @@ "block.quickiefabric.drillwest": "West-Bohrer", "block.quickiefabric.drillnorth": "Nord-Bohrer", "block.quickiefabric.drillstop": "Bohrerstopper", - "block.quickiefabric.blockstackerup": "Blockhochstapler", - "block.quickiefabric.blockstackerdown": "Blocktiefstapler", - "block.quickiefabric.blockstackereast": "Ostblockstapler", - "block.quickiefabric.blockstackerwest": "Westblockstapler", - "block.quickiefabric.blockstackernorth": "Nordblockstapler", - "block.quickiefabric.blockstackersouth": "Südblockstapler", + "block.quickiefabric.blockstackerup": "Hochstapler", + "block.quickiefabric.blockstackerdown": "Tiefstapler", + "block.quickiefabric.blockstackereast": "Oststapler", + "block.quickiefabric.blockstackerwest": "Weststapler", + "block.quickiefabric.blockstackernorth": "Nordstapler", + "block.quickiefabric.blockstackersouth": "Südstapler", "block.quickiefabric.blockspreader": "Blockverteiler", "container.quickiefabric.backpack": "Rucksack", "container.quickiefabric.blockstacker": "Blockstapler", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index 9a100d7..3b6ed6e 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -64,12 +64,12 @@ "block.quickiefabric.drillwest": "west drill", "block.quickiefabric.drillnorth": "north drill", "block.quickiefabric.drillstop": "drill stopper", - "block.quickiefabric.blockstackerup": "block up stacker", - "block.quickiefabric.blockstackerdown": "block down stacker", - "block.quickiefabric.blockstackereast": "block east stacker", - "block.quickiefabric.blockstackerwest": "block west stacker", - "block.quickiefabric.blockstackernorth": "block north stacker", - "block.quickiefabric.blockstackersouth": "block south stacker", + "block.quickiefabric.blockstackerup": "up stacker", + "block.quickiefabric.blockstackerdown": "down stacker", + "block.quickiefabric.blockstackereast": "east stacker", + "block.quickiefabric.blockstackerwest": "west stacker", + "block.quickiefabric.blockstackernorth": "north stacker", + "block.quickiefabric.blockstackersouth": "south stacker", "block.quickiefabric.blockspreader": "block spreader", "container.quickiefabric.backpack": "backpack", "container.quickiefabric.blockstacker": "block stacker", diff --git a/src/main/resources/assets/quickiefabric/textures/gui/blockstacker.png b/src/main/resources/assets/quickiefabric/textures/gui/blockstacker.png index dba71b6..1a10e11 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/gui/blockstacker.png and b/src/main/resources/assets/quickiefabric/textures/gui/blockstacker.png differ