Skip to content

Commit ad4fb65

Browse files
committed
dont create a registry holder for the item filter when its not going to be registered, closes #7
1 parent d09cce6 commit ad4fb65

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ minecraft_version=1.18.2
77
yarn_mappings=1.18.2+build.1
88
loader_version=0.13.3
99
# Mod Properties
10-
mod_version=0.1.9
10+
mod_version=0.1.10
1111
maven_group=com.glisco
1212
archives_base_name=interactic
1313
# Dependencies

src/main/java/interactic/InteracticInit.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class InteracticInit implements ModInitializer {
1919

2020
public static final String MOD_ID = "interactic";
2121

22-
public static final Item ITEM_FILTER = new ItemFilterItem();
22+
private static Item ITEM_FILTER = null;
2323

2424
private static InteracticConfig CONFIG;
2525
private static float itemRotationSpeedMultiplier = 1f;
@@ -39,7 +39,7 @@ public void onInitialize() {
3939
if (FabricLoader.getInstance().isModLoaded("iris")) itemRotationSpeedMultiplier = 0.5f;
4040

4141
if (CONFIG.itemFilterEnabled) {
42-
Registry.register(Registry.ITEM, new Identifier(MOD_ID, "item_filter"), ITEM_FILTER);
42+
ITEM_FILTER = Registry.register(Registry.ITEM, new Identifier(MOD_ID, "item_filter"), new ItemFilterItem());
4343

4444
ServerPlayNetworking.registerGlobalReceiver(new Identifier(MOD_ID, "filter_mode_request"), (server, player, handler, buf, responseSender) -> {
4545
final boolean newMode = buf.readBoolean();
@@ -76,6 +76,10 @@ public void onInitialize() {
7676
}
7777
}
7878

79+
public static Item getItemFilter() {
80+
return ITEM_FILTER;
81+
}
82+
7983
private void dropSelected(PlayerEntity player, boolean dropAll) {
8084
player.dropItem(player.getInventory().removeStack(player.getInventory().selectedSlot, dropAll && !player.getInventory().getMainHandStack().isEmpty() ? player.getInventory().getMainHandStack().getCount() : 1), false, true);
8185
}

src/main/java/interactic/mixin/ItemEntityRendererMixin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void onConstructor(EntityRendererFactory.Context context, CallbackInfo c
5757
this.shadowRadius = 0;
5858
}
5959

60-
@Inject(at = @At("HEAD"), method = "render", cancellable = true)
60+
@Inject(at = @At("HEAD"), method = "render(Lnet/minecraft/entity/ItemEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", cancellable = true)
6161
private void render(ItemEntity entity, float f, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumerProvider, int light, CallbackInfo callback) {
6262
if (!InteracticInit.getConfig().fancyItemRendering) return;
6363

src/main/java/interactic/util/Helpers.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import net.minecraft.nbt.NbtCompound;
1212
import net.minecraft.util.hit.BlockHitResult;
1313
import net.minecraft.util.hit.EntityHitResult;
14-
import net.minecraft.util.hit.HitResult;
1514
import net.minecraft.util.math.Vec3d;
1615

1716
import java.util.Collection;
@@ -43,7 +42,7 @@ public static boolean canPlayerPickUpItem(PlayerEntity player, ItemStack stack)
4342
if (!InteracticInit.getConfig().autoPickup) return false;
4443
if (!InteracticInit.getConfig().itemFilterEnabled) return true;
4544

46-
var filterOptional = ((PlayerInventoryAccessor) player.getInventory()).getCombinedInventory().stream().flatMap(Collection::stream).filter(itemStack -> itemStack.isOf(InteracticInit.ITEM_FILTER)).findFirst();
45+
var filterOptional = ((PlayerInventoryAccessor) player.getInventory()).getCombinedInventory().stream().flatMap(Collection::stream).filter(itemStack -> itemStack.isOf(InteracticInit.getItemFilter())).findFirst();
4746
if (filterOptional.isEmpty()) return true;
4847

4948
final ItemStack filterStack = filterOptional.get();

0 commit comments

Comments
 (0)