Merge branch 'master' into Blood-Frames

This commit is contained in:
Martin Robertz authored and GitHub committed 2023-04-30 12:06:03 +02:00
commit 66b1f3e075
13 files changed
+642 -25

No files matched your search

@@ -1,5 +1,8 @@
package magicbees.client.gui;
import magicbees.itemInventories.InventoryBeeRing;
import magicbees.tileentity.TileEntityEffectJar;
import magicbees.tileentity.TileEntityMagicApiary;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@@ -18,6 +21,8 @@ public class GUIHandler implements IGuiHandler {
} else if (ID == UIScreens.THAUMIC_APIARY.ordinal()) {
TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z);
value = new ContainerMagicApiary(player.inventory, tileEntityThaumicApiary);
} else if (ID == UIScreens.EFFECT_RING.ordinal()) {
value = new ContainerEffectRing(new InventoryBeeRing(player.getHeldItem(), player), player.inventory);
}
return value;
@@ -30,8 +35,9 @@ public class GUIHandler implements IGuiHandler {
} else if (ID == UIScreens.THAUMIC_APIARY.ordinal()) {
TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z);
return new GuiMagicApiary(player.inventory, tileEntityThaumicApiary);
} else {
return null;
} else if (ID == UIScreens.EFFECT_RING.ordinal()) {
return new GUIEffectRing(new InventoryBeeRing(player.getHeldItem(), player), player.inventory);
}
return null;
}
}