Skip to content

Commit 8aef024

Browse files
Andrew6rantAndrew6rant
authored
Merge pull request #80 from ThebestkillerTBK/1.19.x
1.19.3 Support
2 parents fe84638 + 4e24440 commit 8aef024

16 files changed

+68
-79
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.12-SNAPSHOT'
2+
id 'fabric-loom' version '1.0-SNAPSHOT'
33
id 'maven-publish'
44
}
55

‎gradle.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=1.19
7-
yarn_mappings=1.19+build.2
8-
loader_version=0.14.7
6+
minecraft_version=1.19.3
7+
yarn_mappings=1.19.3+build.2
8+
loader_version=0.14.11
99

1010
# Mod Properties
11-
mod_version = 0.9.0-beta-1.19.x
11+
mod_version = 0.9.0-beta-1.19.3
1212
maven_group = com.kqp
1313
archives_base_name = inventorytabs
1414

1515
# Dependencies
16-
fabric_version=0.55.3+1.19
17-
clothconfig_version=7.0.72
18-
modmenu_version=4.0.0
16+
fabric_version=0.68.0+1.19.3
17+
clothconfig_version=9.0.94
18+
modmenu_version=5.0.0

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/java/com/kqp/inventorytabs/api/TabProviderRegistry.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package com.kqp.inventorytabs.api;
22

3-
import java.util.*;
4-
53
import com.kqp.inventorytabs.init.InventoryTabs;
64
import com.kqp.inventorytabs.interf.TabManagerContainer;
75
import com.kqp.inventorytabs.tabs.provider.*;
8-
96
import net.minecraft.block.*;
107
import net.minecraft.client.MinecraftClient;
11-
import net.minecraft.tag.TagKey;
8+
import net.minecraft.registry.Registries;
9+
import net.minecraft.registry.RegistryKeys;
10+
import net.minecraft.registry.tag.TagKey;
1211
import net.minecraft.util.Identifier;
13-
import net.minecraft.util.registry.Registry;
1412
import org.apache.logging.log4j.LogManager;
1513
import org.apache.logging.log4j.Logger;
1614

17-
import static net.minecraft.util.registry.Registry.BLOCK_KEY;
15+
import java.util.*;
1816

1917
/**
2018
* Registry for tab providers.
@@ -43,7 +41,7 @@ public class TabProviderRegistry {
4341
InventoryTabs.id("inventory_tab_provider"), new InventoryTabProvider());
4442

4543
public static void init(String configMsg) {
46-
LOGGER.info("InventoryTabs: Attempting to "+configMsg+" config...");
44+
LOGGER.info("InventoryTabs: Attempting to " + configMsg + " config...");
4745
if (InventoryTabs.getConfig().debugEnabled) {
4846
LOGGER.warn("InventoryTabs: DEBUG ENABLED");
4947
}
@@ -57,7 +55,7 @@ public static void init(String configMsg) {
5755
blockSet.add(overrideEntry);
5856
}
5957
}
60-
Registry.BLOCK.forEach(block -> {
58+
Registries.BLOCK.forEach(block -> {
6159
if (block instanceof BlockEntityProvider) {
6260
if (block instanceof AbstractChestBlock) {
6361
registerChest(block);
@@ -76,7 +74,7 @@ public static void init(String configMsg) {
7674
MinecraftClient client = MinecraftClient.getInstance();
7775
TabManagerContainer tabManagerContainer = (TabManagerContainer) client;
7876
tabManagerContainer.getTabManager().removeTabs();
79-
LOGGER.info(configMsg.equals("save") ? "InventoryTabs: Config saved!": "InventoryTabs: Config "+configMsg+"ed!");
77+
LOGGER.info(configMsg.equals("save") ? "InventoryTabs: Config saved!" : "InventoryTabs: Config " + configMsg + "ed!");
8078
}
8179

8280
private static void modCompatAdd() {
@@ -89,13 +87,15 @@ private static void modCompatAdd() {
8987
registerInventoryTab(new Identifier("onastick", "stonecutter_on_a_stick"));
9088
registerInventoryTab(new Identifier("craftingpad", "craftingpad"));
9189
}
90+
9291
public static boolean isValid(String overrideEntry, String[] splitEntry, Set<String> invalidSet) {
9392
if (splitEntry.length != 2) {
9493
invalidSet.add(overrideEntry);
9594
return false;
9695
}
9796
return true;
9897
}
98+
9999
private static void configRemove(Set<String> blockSet) {
100100
for (String overrideEntry : blockSet) {
101101
if (InventoryTabs.getConfig().debugEnabled) {
@@ -104,13 +104,14 @@ private static void configRemove(Set<String> blockSet) {
104104
removeSimpleBlock(new Identifier(overrideEntry));
105105
}
106106
}
107+
107108
private static void configRemove(Block block, Set<String> tagSet, Set<String> invalidSet) {
108109
for (String overrideEntry : tagSet) {
109110
String[] splitEntry = overrideEntry.split(":"); // split into two parts: tag id, item name
110111
if (isValid(overrideEntry, splitEntry, invalidSet)) {
111112
List<TagKey<Block>> blockStream = block.getRegistryEntry().streamTags().toList();
112113
for (TagKey<Block> tagKey : blockStream) {
113-
if (block.getRegistryEntry().isIn(TagKey.of(BLOCK_KEY, new Identifier(splitEntry[0], splitEntry[1])))) {
114+
if (block.getRegistryEntry().isIn(TagKey.of(RegistryKeys.BLOCK, new Identifier(splitEntry[0], splitEntry[1])))) {
114115
removeSimpleBlock(block);
115116
if (InventoryTabs.getConfig().debugEnabled) {
116117
LOGGER.info("Excluding: " + block);
@@ -129,6 +130,7 @@ private static void configAdd() {
129130
registerSimpleBlock(new Identifier(included_tab));
130131
}
131132
}
133+
132134
public static void registerInventoryTab(Identifier itemId) {
133135
INVENTORY_TAB_PROVIDER.addItem(itemId);
134136
}
@@ -160,6 +162,7 @@ public static void registerSimpleBlock(Identifier blockId) {
160162
public static void removeSimpleBlock(Block block) {
161163
SIMPLE_BLOCK_TAB_PROVIDER.removeBlock(block);
162164
}
165+
163166
public static void removeSimpleBlock(Identifier blockId) {
164167
SIMPLE_BLOCK_TAB_PROVIDER.removeBlock(blockId);
165168
}

‎src/main/java/com/kqp/inventorytabs/tabs/provider/ChestTabProvider.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package com.kqp.inventorytabs.tabs.provider;
22

3-
import java.util.HashSet;
4-
import java.util.List;
5-
import java.util.Set;
6-
import java.util.stream.Collectors;
7-
83
import com.kqp.inventorytabs.tabs.tab.ChestTab;
94
import com.kqp.inventorytabs.tabs.tab.Tab;
105
import com.kqp.inventorytabs.util.ChestUtil;
11-
126
import net.minecraft.block.Block;
13-
import net.minecraft.block.BlockState;
147
import net.minecraft.block.ChestBlock;
158
import net.minecraft.client.network.ClientPlayerEntity;
16-
import net.minecraft.state.property.Properties;
9+
import net.minecraft.registry.Registries;
1710
import net.minecraft.util.Identifier;
1811
import net.minecraft.util.math.BlockPos;
19-
import net.minecraft.util.registry.Registry;
2012
import net.minecraft.world.World;
2113

14+
import java.util.HashSet;
15+
import java.util.List;
16+
import java.util.Set;
17+
import java.util.stream.Collectors;
18+
2219
/**
2320
* Provides tabs for chests. Limits double chests to having only one tab and
2421
* takes into account if it's blocked.
@@ -33,7 +30,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
3330
Set<ChestTab> tabsToRemove = new HashSet<>();
3431

3532
List<ChestTab> chestTabs = tabs.stream().filter(tab -> tab instanceof ChestTab).map(tab -> (ChestTab) tab)
36-
.filter(tab -> chestBlocks.contains(tab.blockId)).collect(Collectors.toList());
33+
.filter(tab -> chestBlocks.contains(tab.blockId)).toList();
3734

3835
World world = player.world;
3936

@@ -52,7 +49,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
5249
}
5350

5451
public void addChestBlock(Block block) {
55-
chestBlocks.add(Registry.BLOCK.getId(block));
52+
chestBlocks.add(Registries.BLOCK.getId(block));
5653
}
5754

5855
public void addChestBlock(Identifier blockId) {
@@ -71,11 +68,11 @@ public Set<Identifier> getChestBlockIds() {
7168
public boolean matches(World world, BlockPos pos) {
7269
Block block = world.getBlockState(pos).getBlock();
7370

74-
return chestBlocks.contains(Registry.BLOCK.getId(block));
71+
return chestBlocks.contains(Registries.BLOCK.getId(block));
7572
}
7673

7774
@Override
7875
public Tab createTab(World world, BlockPos pos) {
79-
return new ChestTab(Registry.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
76+
return new ChestTab(Registries.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
8077
}
8178
}

‎src/main/java/com/kqp/inventorytabs/tabs/provider/EnderChestTabProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.minecraft.block.Blocks;
1212
import net.minecraft.block.ChestBlock;
1313
import net.minecraft.client.network.ClientPlayerEntity;
14+
import net.minecraft.registry.Registries;
1415
import net.minecraft.util.math.BlockPos;
15-
import net.minecraft.util.registry.Registry;
1616
import net.minecraft.world.World;
1717

1818
/**
@@ -27,7 +27,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
2727
Set<ChestTab> tabsToRemove = new HashSet<>();
2828

2929
List<ChestTab> chestTabs = tabs.stream().filter(tab -> tab instanceof ChestTab).map(tab -> (ChestTab) tab)
30-
.filter(tab -> tab.blockId == Registry.BLOCK.getId(Blocks.ENDER_CHEST)).collect(Collectors.toList());
30+
.filter(tab -> tab.blockId == Registries.BLOCK.getId(Blocks.ENDER_CHEST)).toList();
3131

3232
World world = player.world;
3333

@@ -56,6 +56,6 @@ public boolean matches(World world, BlockPos pos) {
5656

5757
@Override
5858
public Tab createTab(World world, BlockPos pos) {
59-
return new ChestTab(Registry.BLOCK.getId(Blocks.ENDER_CHEST), pos);
59+
return new ChestTab(Registries.BLOCK.getId(Blocks.ENDER_CHEST), pos);
6060
}
6161
}

‎src/main/java/com/kqp/inventorytabs/tabs/provider/InventoryTabProvider.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package com.kqp.inventorytabs.tabs.provider;
22

3-
import com.kqp.inventorytabs.tabs.tab.ChestTab;
43
import com.kqp.inventorytabs.tabs.tab.InventoryTab;
5-
import com.kqp.inventorytabs.tabs.tab.PlayerInventoryTab;
64
import com.kqp.inventorytabs.tabs.tab.Tab;
7-
import net.minecraft.block.Block;
85
import net.minecraft.client.network.ClientPlayerEntity;
96
import net.minecraft.item.Item;
107
import net.minecraft.item.ItemStack;
8+
import net.minecraft.registry.Registries;
119
import net.minecraft.util.Identifier;
12-
import net.minecraft.util.math.BlockPos;
13-
import net.minecraft.util.registry.Registry;
14-
import net.minecraft.world.World;
1510

1611
import java.util.HashSet;
1712
import java.util.List;
@@ -23,7 +18,7 @@ public class InventoryTabProvider implements TabProvider {
2318

2419
@Override
2520
public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
26-
Set<Item> itemSet = inventoryItems.stream().map(Registry.ITEM::get).collect(Collectors.toSet());
21+
Set<Item> itemSet = inventoryItems.stream().map(Registries.ITEM::get).collect(Collectors.toSet());
2722
for (Item item : itemSet) {
2823
if (player.getInventory().contains(new ItemStack(item))) {
2924
Tab tab = new InventoryTab(item);
@@ -43,7 +38,7 @@ public Set<Identifier> getItemIds() {
4338
}
4439

4540
public static Set<Item> getItems() {
46-
return inventoryItems.stream().map(Registry.ITEM::get).collect(Collectors.toSet());
41+
return inventoryItems.stream().map(Registries.ITEM::get).collect(Collectors.toSet());
4742
}
4843

4944
}

‎src/main/java/com/kqp/inventorytabs/tabs/provider/LecternTabProvider.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package com.kqp.inventorytabs.tabs.provider;
22

3-
import com.kqp.inventorytabs.mixin.ShulkerBoxBlockInvoker;
43
import com.kqp.inventorytabs.tabs.tab.SimpleBlockTab;
54
import com.kqp.inventorytabs.tabs.tab.Tab;
65
import net.minecraft.block.BlockState;
76
import net.minecraft.block.Blocks;
87
import net.minecraft.block.entity.BlockEntity;
98
import net.minecraft.block.entity.LecternBlockEntity;
10-
import net.minecraft.block.entity.ShulkerBoxBlockEntity;
119
import net.minecraft.client.network.ClientPlayerEntity;
10+
import net.minecraft.registry.Registries;
1211
import net.minecraft.util.math.BlockPos;
13-
import net.minecraft.util.registry.Registry;
1412
import net.minecraft.world.World;
1513

1614
import java.util.HashSet;
@@ -27,7 +25,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
2725
super.addAvailableTabs(player, tabs);
2826
Set<SimpleBlockTab> tabsToRemove = new HashSet<>();
2927
List<SimpleBlockTab> lecternTabs = tabs.stream().filter(tab -> tab instanceof SimpleBlockTab).map(tab -> (SimpleBlockTab) tab)
30-
.filter(tab -> tab.blockId == Registry.BLOCK.getId(Blocks.LECTERN)).collect(Collectors.toList());
28+
.filter(tab -> tab.blockId == Registries.BLOCK.getId(Blocks.LECTERN)).toList();
3129
lecternTabs.stream().filter(tab -> {
3230
BlockEntity blockEntity = player.world.getBlockEntity(tab.blockPos);
3331

@@ -42,6 +40,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
4240

4341
tabs.removeAll(tabsToRemove);
4442
}
43+
4544
@Override
4645
public boolean matches(World world, BlockPos pos) {
4746
return false;

‎src/main/java/com/kqp/inventorytabs/tabs/provider/ShulkerBoxTabProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import net.minecraft.block.entity.BlockEntity;
1515
import net.minecraft.block.entity.ShulkerBoxBlockEntity;
1616
import net.minecraft.client.network.ClientPlayerEntity;
17+
import net.minecraft.registry.Registries;
1718
import net.minecraft.util.math.BlockPos;
18-
import net.minecraft.util.registry.Registry;
1919
import net.minecraft.world.World;
2020

2121
/**
@@ -30,7 +30,7 @@ public void addAvailableTabs(ClientPlayerEntity player, List<Tab> tabs) {
3030

3131
List<SimpleBlockTab> shulkerTabs = tabs.stream().filter(tab -> tab instanceof SimpleBlockTab)
3232
.map(tab -> (SimpleBlockTab) tab)
33-
.filter(tab -> Registry.BLOCK.get(tab.blockId) instanceof ShulkerBoxBlock).collect(Collectors.toList());
33+
.filter(tab -> Registries.BLOCK.get(tab.blockId) instanceof ShulkerBoxBlock).toList();
3434

3535
// Add any chests that are blocked
3636
shulkerTabs.stream().filter(tab -> {
@@ -56,6 +56,6 @@ public boolean matches(World world, BlockPos pos) {
5656

5757
@Override
5858
public Tab createTab(World world, BlockPos pos) {
59-
return new SimpleBlockTab(Registry.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
59+
return new SimpleBlockTab(Registries.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
6060
}
6161
}

‎src/main/java/com/kqp/inventorytabs/tabs/provider/SimpleBlockTabProvider.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
import net.minecraft.block.Block;
1111
import net.minecraft.block.BlockState;
12+
import net.minecraft.registry.Registries;
1213
import net.minecraft.util.Identifier;
1314
import net.minecraft.util.math.BlockPos;
14-
import net.minecraft.util.registry.Registry;
1515
import net.minecraft.world.World;
1616

1717
/**
@@ -24,15 +24,15 @@ public SimpleBlockTabProvider() {
2424
}
2525

2626
public void addBlock(Block block) {
27-
blockIds.add(Registry.BLOCK.getId(block));
27+
blockIds.add(Registries.BLOCK.getId(block));
2828
}
2929

3030
public void addBlock(Identifier identifier) {
3131
blockIds.add(identifier);
3232
}
3333

3434
public void removeBlock(Block block) {
35-
blockIds.remove(Registry.BLOCK.getId(block));
35+
blockIds.remove(Registries.BLOCK.getId(block));
3636
}
3737

3838
public void removeBlock(Identifier identifier) {
@@ -44,22 +44,18 @@ public Set<Identifier> getBlockIds() {
4444
}
4545

4646
public Set<Block> getBlocks() {
47-
return this.blockIds.stream().map(Registry.BLOCK::get).collect(Collectors.toSet());
47+
return this.blockIds.stream().map(Registries.BLOCK::get).collect(Collectors.toSet());
4848
}
4949

5050
@Override
5151
public boolean matches(World world, BlockPos pos) {
5252
BlockState blockState = world.getBlockState(pos);
5353

54-
if (blockIds.contains(Registry.BLOCK.getId(blockState.getBlock()))) {
55-
return true;
56-
}
57-
58-
return false;
54+
return blockIds.contains(Registries.BLOCK.getId(blockState.getBlock()));
5955
}
6056

6157
@Override
6258
public Tab createTab(World world, BlockPos pos) {
63-
return new SimpleBlockTab(Registry.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
59+
return new SimpleBlockTab(Registries.BLOCK.getId(world.getBlockState(pos).getBlock()), pos);
6460
}
6561
}

0 commit comments

Comments
 (0)