Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent NPE in LootMixin #28

Merged
merged 9 commits into from
Jun 10, 2024
Merged

Prevent NPE in LootMixin #28

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
679e6eb
Prevent NPE in LootMixin
jlortiz0 Apr 6, 2023
2b1ec00
Retab
jlortiz0 Apr 6, 2023
d1e5739
Use loot table as fallback
jlortiz0 Apr 6, 2023
ecb2e6f
Remove unused imports
jlortiz0 Apr 6, 2023
4d26ed7
Don't crash on non-standard container sizes
jlortiz0 Apr 15, 2023
cd165b8
Prevent spawning outside of chest
jlortiz0 Apr 15, 2023
b5fb4a9
Spacing
jlortiz0 Apr 16, 2023
98334d7
Merge branch 'master' into master
JSJBDEV Jun 10, 2024
ffd3926
use new random syntax
JSJBDEV Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/gd/rf/acro/givemehats/GiveMeHats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void registerItems()

for(Item hat: LOADED_HATS)
{
Registry.register(Registry.ITEM,new Identifier("givemehats",cc2uc(hat.getClass().getSimpleName().replace("Item",""))),hat);
Registry.register(Registry.ITEM, new Identifier("givemehats",cc2uc(hat.getClass().getSimpleName().replace("Item",""))), hat);
TrinketRendererRegistry.registerRenderer(hat, (TrinketRenderer) hat);

}
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/gd/rf/acro/givemehats/mixin/LootMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,32 @@ public abstract class LootMixin extends LockableContainerBlockEntity {

@Shadow protected abstract DefaultedList<ItemStack> getInvStackList();

@Shadow protected long lootTableSeed;

private final boolean isChest;

protected LootMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
super(blockEntityType, blockPos, blockState);
this.isChest = blockEntityType == BlockEntityType.CHEST;
}


@Inject(method = "checkLootInteraction", at = @At("HEAD"))
private void loot(PlayerEntity player, CallbackInfo ci)
{
if (this.lootTableId != null && this.world.getServer() != null)
if (this.isChest && this.lootTableId != null && this.world.getServer() != null)
{
Random random = player.getRandom();
Random random;
if (player == null)
{
random = new Random(this.lootTableSeed);
} else {
random = player.getRandom();
}
for (int i = 0; i < Integer.parseInt(ConfigUtils.config.getOrDefault("max_hats_per_chest","3")); i++) {
if(random.nextInt(Integer.parseInt(ConfigUtils.config.getOrDefault("no_hat_per_roll","3")))==0)
{
this.getInvStackList().set(RandomUtils.nextInt(0,27),new ItemStack(GiveMeHats.LOADED_HATS.get(random.nextInt(GiveMeHats.LOADED_HATS.size()))));
this.getInvStackList().set(RandomUtils.nextInt(0,this.size()),new ItemStack(GiveMeHats.LOADED_HATS.get(random.nextInt(GiveMeHats.LOADED_HATS.size()))));
}
}

Expand Down