Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 11:53:29 +01:00
Code Issues Projects Releases Wiki Activity

ensure that weird mixins don't break the multiblock maker

Browse source 
Closes #233
This commit is contained in:
Ell 2021-12-23 12:52:48 +01:00
parent 6c647897e3
commit f5428adbc6
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/main/java/de/ellpeck/naturesaura/items/ItemMultiblockMaker.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.multiblock.IMultiblock; import de.ellpeck.naturesaura.api.multiblock.IMultiblock;
import de.ellpeck.naturesaura.blocks.multi.Multiblock;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.MutableComponent;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
@ -23,25 +24,11 @@ public class ItemMultiblockMaker extends ItemImpl {
super("multiblock_maker"); super("multiblock_maker");
} }
private static int getMultiblock(ItemStack stack) {
if (!stack.hasTag())
return -1;
return stack.getTag().getInt("multiblock");
}
private static List<IMultiblock> multiblocks() {
if (multiblocks == null) {
multiblocks = new ArrayList<>();
multiblocks.addAll(NaturesAuraAPI.MULTIBLOCKS.values());
}
return multiblocks;
}
@Override @Override
public InteractionResultHolder<ItemStack> use(Level levelIn, Player playerIn, InteractionHand handIn) { public InteractionResultHolder<ItemStack> use(Level levelIn, Player playerIn, InteractionHand handIn) {
var stack = playerIn.getItemInHand(handIn); var stack = playerIn.getItemInHand(handIn);
if (!levelIn.isClientSide && playerIn.isCreative()) { if (!levelIn.isClientSide && playerIn.isCreative()) {
var curr = getMultiblock(stack); var curr = getMultiblockId(stack);
var next = (curr + 1) % multiblocks().size(); var next = (curr + 1) % multiblocks().size();
stack.getOrCreateTag().putInt("multiblock", next); stack.getOrCreateTag().putInt("multiblock", next);
} }
@ -52,10 +39,7 @@ public class ItemMultiblockMaker extends ItemImpl {
public InteractionResult useOn(UseOnContext context) { public InteractionResult useOn(UseOnContext context) {
var player = context.getPlayer(); var player = context.getPlayer();
if (player.isCreative()) { if (player.isCreative()) {
var id = getMultiblock(player.getItemInHand(context.getHand())); var multi = getMultiblock(player.getItemInHand(context.getHand()));
if (id < 0)
return InteractionResult.PASS;
var multi = multiblocks().get(id);
if (multi == null) if (multi == null)
return InteractionResult.PASS; return InteractionResult.PASS;
@ -73,11 +57,34 @@ public class ItemMultiblockMaker extends ItemImpl {
@Override @Override
public Component getName(ItemStack stack) { public Component getName(ItemStack stack) {
var name = (MutableComponent) super.getName(stack); var name = (MutableComponent) super.getName(stack);
var id = getMultiblock(stack); var multi = getMultiblock(stack);
if (id < 0)
return name;
var multi = multiblocks().get(id);
return multi == null ? name : name.append(" (" + multi.getName() + ")"); return multi == null ? name : name.append(" (" + multi.getName() + ")");
} }
private static List<IMultiblock> multiblocks() {
if (multiblocks == null) {
// some weird mixins call getName way too early, before multiblocks are initialized
if (NaturesAuraAPI.MULTIBLOCKS.isEmpty())
return null;
multiblocks = new ArrayList<>();
multiblocks.addAll(NaturesAuraAPI.MULTIBLOCKS.values());
}
return multiblocks;
}
private static int getMultiblockId(ItemStack stack) {
if (!stack.hasTag())
return -1;
return stack.getTag().getInt("multiblock");
}
private static IMultiblock getMultiblock(ItemStack stack) {
var multiblocks = multiblocks();
if (multiblocks == null)
return null;
var id = getMultiblockId(stack);
if (id < 0 || id >= multiblocks.size())
return null;
return multiblocks.get(id);
}
} }