Skip to content

Commit 0b9b557

Browse files
committed
closed #3,closed #4
1 parent 7fe035f commit 0b9b557

7 files changed

Lines changed: 28 additions & 14 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ logs/
77
docs/
88
src/test
99
AGENTS.md
10+
CLAUDE.md

src/main/java/appbot/block/FluixPool.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ public boolean hasTileEntity(IBlockState state) {
149149
@Nonnull
150150
@Override
151151
public TileEntity createTileEntity(World world, IBlockState state) {
152-
return new FluixPoolBlockEntity();
152+
return new TileFluixPool();
153153
}
154154

155155
@Override
156156
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, @Nullable EntityLivingBase placer,
157157
ItemStack stack) {
158-
if (placer instanceof EntityPlayer player && world.getTileEntity(pos) instanceof FluixPoolBlockEntity tile) {
158+
if (placer instanceof EntityPlayer player && world.getTileEntity(pos) instanceof TileFluixPool tile) {
159159
tile.getMainNode().setOwningPlayer(player);
160160
}
161161
}
@@ -209,7 +209,7 @@ public boolean hasComparatorInputOverride(IBlockState state) {
209209
@SuppressWarnings("deprecation")
210210
public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) {
211211
TileEntity tile = world.getTileEntity(pos);
212-
return tile instanceof FluixPoolBlockEntity pool ? pool.calculateComparatorLevel() : 0;
212+
return tile instanceof TileFluixPool pool ? pool.calculateComparatorLevel() : 0;
213213
}
214214

215215
@Override

src/main/java/appbot/block/FluixPoolBlockEntity.java renamed to src/main/java/appbot/block/TileFluixPool.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import ae2.me.helpers.IGridConnectedTile;
2828
import ae2.me.helpers.TileNodeListener;
2929

30-
public class FluixPoolBlockEntity extends TilePool implements IGridConnectedTile, SafeMana {
30+
public class TileFluixPool extends TilePool implements IGridConnectedTile, SafeMana {
3131

3232
private static final String TAG_MANA = "mana";
3333
private static final String TAG_MANA_CAP = "manaCap";
@@ -116,6 +116,19 @@ public int getMaxMana() {
116116
return Ints.saturatedCast(saturatedAdd(current, free));
117117
}
118118

119+
@Override
120+
public int getAvailableSpaceForMana() {
121+
IGrid grid = getMainNode().getGrid();
122+
123+
if (grid == null || !getMainNode().isActive()) {
124+
return 0;
125+
}
126+
127+
long free = grid.getStorageService().getInventory().insert(ManaKey.KEY, Long.MAX_VALUE, Actionable.SIMULATE,
128+
actionSource);
129+
return Ints.saturatedCast(free);
130+
}
131+
119132
@Override
120133
public void update() {
121134
super.update();
@@ -208,7 +221,7 @@ public void onReady() {
208221
@Override
209222
public void validate() {
210223
super.validate();
211-
GridHelper.onFirstTick(this, FluixPoolBlockEntity::onReady);
224+
GridHelper.onFirstTick(this, TileFluixPool::onReady);
212225
}
213226

214227
@Override

src/main/java/appbot/client/AppliedBotanicsClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import appbot.AppliedBotanics;
1818
import appbot.ae2.ManaKey;
1919
import appbot.ae2.ManaKeyType;
20-
import appbot.block.FluixPoolBlockEntity;
20+
import appbot.block.TileFluixPool;
2121
import appbot.common.ABItems;
2222

2323
import ae2.api.client.AEKeyRendering;
@@ -30,7 +30,7 @@ public interface AppliedBotanicsClient {
3030

3131
static void initialize() {
3232
AEKeyRendering.register(ManaKeyType.TYPE, ManaKey.class, new ManaRenderer());
33-
ClientRegistry.bindTileEntitySpecialRenderer(FluixPoolBlockEntity.class, new FluixPoolRenderer());
33+
ClientRegistry.bindTileEntitySpecialRenderer(TileFluixPool.class, new FluixPoolRenderer());
3434
registerItemColors(Minecraft.getMinecraft().getItemColors());
3535
}
3636

src/main/java/appbot/client/FluixPoolRenderer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
import net.minecraftforge.fml.relauncher.Side;
1212
import net.minecraftforge.fml.relauncher.SideOnly;
1313

14-
import appbot.block.FluixPoolBlockEntity;
14+
import appbot.block.TileFluixPool;
1515
import vazkii.botania.client.core.handler.MiscellaneousIcons;
1616
import vazkii.botania.client.core.helper.ShaderHelper;
1717

1818
@SideOnly(Side.CLIENT)
19-
public class FluixPoolRenderer extends TileEntitySpecialRenderer<FluixPoolBlockEntity> {
19+
public class FluixPoolRenderer extends TileEntitySpecialRenderer<TileFluixPool> {
2020

2121
@Override
22-
public void render(FluixPoolBlockEntity pool, double x, double y, double z, float partialTicks,
22+
public void render(TileFluixPool pool, double x, double y, double z, float partialTicks,
2323
int destroyStage, float alpha) {
2424
int mana = pool.getCurrentMana();
2525
int manaCap = pool.getMaxMana();

src/main/java/appbot/common/ABBlocks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.minecraftforge.fml.common.registry.GameRegistry;
1010

1111
import appbot.block.FluixPool;
12-
import appbot.block.FluixPoolBlockEntity;
12+
import appbot.block.TileFluixPool;
1313

1414
import java.util.Objects;
1515

@@ -24,7 +24,7 @@ private ABBlocks() {
2424
@SubscribeEvent
2525
public static void registerBlocks(RegistryEvent.Register<Block> event) {
2626
event.getRegistry().register(FLUIX_MANA_POOL);
27-
GameRegistry.registerTileEntity(FluixPoolBlockEntity.class, AppliedBotanics.id("fluix_mana_pool"));
27+
GameRegistry.registerTileEntity(TileFluixPool.class, AppliedBotanics.id("fluix_mana_pool"));
2828
}
2929

3030
@SubscribeEvent
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package appbot.integration.igtooltip;
22

33
import appbot.block.FluixPool;
4-
import appbot.block.FluixPoolBlockEntity;
4+
import appbot.block.TileFluixPool;
55

66
import ae2.api.integrations.igtooltip.BaseClassRegistration;
77
import ae2.api.integrations.igtooltip.TooltipProvider;
@@ -11,6 +11,6 @@ public class ABTooltipProvider implements TooltipProvider {
1111

1212
@Override
1313
public void registerBlockEntityBaseClasses(BaseClassRegistration registration) {
14-
registration.addBaseBlockEntity(FluixPoolBlockEntity.class, FluixPool.class);
14+
registration.addBaseBlockEntity(TileFluixPool.class, FluixPool.class);
1515
}
1616
}

0 commit comments

Comments
 (0)