Right click to update mana is gone :crabrave:

This commit is contained in:
Vincent Lee committed 2020-03-13 16:33:02 -05:00
1 parent 86bb0df996
commit ae6679d06f
17 files changed
+14 -66

No files matched your search

@@ -49,7 +49,6 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower {
int sizeLastCheck = -1;
TileEntity linkedPool = null;
public int knownMana = -1;
BlockPos cachedPoolCoordinates = null;
@@ -149,7 +148,6 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower {
if(player == null)
return false;
knownMana = mana;
SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT);
if(evt != null)
player.playSound(evt, 0.1F, 1F);
@@ -239,7 +237,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower {
public void renderHUD(Minecraft mc) {
String name = I18n.format(getBlockState().getBlock().getTranslationKey());
int color = getColor();
BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
}
}
@@ -56,7 +56,6 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
int sizeLastCheck = -1;
protected TileEntity linkedCollector = null;
public int knownMana = -1;
public int passiveDecayTicks;
BlockPos cachedCollectorCoordinates = null;
@@ -204,7 +203,6 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
if(!player.world.isRemote)
sync();
knownMana = getMana();
SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT);
if(evt != null)
player.playSound(evt, 0.1F, 1F);
@@ -294,7 +292,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
public void renderHUD(Minecraft mc) {
String name = I18n.format(getBlockState().getBlock().getTranslationKey());
int color = getColor();
BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
}
@Override
@@ -383,14 +383,7 @@ public final class HUDHandler {
x = mc.mainWindow.getScaledWidth() / 2 - 51;
y += 10;
renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana);
if(mana < 0) {
String text = I18n.format("botaniamisc.statusUnknown");
x = mc.mainWindow.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2;
y -= 1;
mc.fontRenderer.drawString(text, x, y, color);
}
renderManaBar(x, y, color, 1F, mana, maxMana);
GlStateManager.disableBlend();
}
@@ -75,7 +75,6 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
private static final int MAX_MANA_DILLUTED = 10000;
private static final String TAG_MANA = "mana";
private static final String TAG_KNOWN_MANA = "knownMana";
private static final String TAG_OUTPUTTING = "outputting";
private static final String TAG_COLOR = "color";
private static final String TAG_MANA_CAP = "manaCap";
@@ -91,7 +90,6 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
public DyeColor color = DyeColor.WHITE;
private int mana;
private int knownMana = -1;
public int manaCap = -1;
private int soundTicks = 0;
@@ -366,30 +364,14 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
inputKey = cmp.getString(TAG_INPUT_KEY);
if(cmp.contains(TAG_OUTPUT_KEY))
inputKey = cmp.getString(TAG_OUTPUT_KEY);
if(cmp.contains(TAG_KNOWN_MANA))
knownMana = cmp.getInt(TAG_KNOWN_MANA);
}
public void onWanded(PlayerEntity player, ItemStack wand) {
if(player == null || player.isSneaking()) {
outputting = !outputting;
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos);
}
if(!world.isRemote) {
CompoundNBT nbttagcompound = new CompoundNBT();
writePacketNBT(nbttagcompound);
nbttagcompound.putInt(TAG_KNOWN_MANA, getCurrentMana());
if(player instanceof ServerPlayerEntity)
((ServerPlayerEntity) player).connection.sendPacket(new SUpdateTileEntityPacket(pos, -999, nbttagcompound));
}
if(player == null) {
world.playSound(null, getPos(), ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F);
} else {
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F);
}
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos);
}
@OnlyIn(Dist.CLIENT)
@@ -397,7 +379,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
ItemStack pool = new ItemStack(getBlockState().getBlock());
String name = pool.getDisplayName().getString();
int color = 0x4444FF;
HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name);
HUDHandler.drawSimpleManaHUD(color, getCurrentMana(), manaCap, name);
int x = Minecraft.getInstance().mainWindow.getScaledWidth() / 2 - 11;
int y = Minecraft.getInstance().mainWindow.getScaledHeight() / 2 + 30;
@@ -84,7 +84,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
private static final String TAG_UUID_MOST = "uuidMost";
private static final String TAG_UUID_LEAST = "uuidLeast";
private static final String TAG_MANA = "mana";
private static final String TAG_KNOWN_MANA = "knownMana";
private static final String TAG_REQUEST_UPDATE = "requestUpdate";
private static final String TAG_ROTATION_X = "rotationX";
private static final String TAG_ROTATION_Y = "rotationY";
@@ -132,7 +131,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
UUID identity;
private int mana;
private int knownMana = -1;
public float rotationX, rotationY;
@Nullable
@@ -341,8 +339,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
mmForcedGravity = cmp.getFloat(TAG_FORCED_GRAVITY);
mmForcedVelocityMultiplier = cmp.getFloat(TAG_FORCED_VELOCITY_MULTIPLIER);
if(cmp.contains(TAG_KNOWN_MANA))
knownMana = cmp.getInt(TAG_KNOWN_MANA);
if(cmp.contains(TAG_PADDING_COLOR))
paddingColor = cmp.getInt(TAG_PADDING_COLOR) == -1 ? null : DyeColor.byId(cmp.getInt(TAG_PADDING_COLOR));
if(cmp.contains(TAG_CAN_SHOOT_BURST))
@@ -384,14 +380,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
return;
if(!player.isSneaking()) {
if(!world.isRemote) {
CompoundNBT nbttagcompound = new CompoundNBT();
writePacketNBT(nbttagcompound);
nbttagcompound.putInt(TAG_KNOWN_MANA, mana);
if(player instanceof ServerPlayerEntity)
((ServerPlayerEntity) player).connection.sendPacket(new SUpdateTileEntityPacket(pos, -999, nbttagcompound));
}
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this);
} else {
RayTraceResult pos = Item.rayTrace(world, player, RayTraceContext.FluidMode.ANY);
if(pos instanceof BlockRayTraceResult && !world.isRemote) {
@@ -551,7 +540,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
public void renderHUD(Minecraft mc) {
String name = new ItemStack(getBlockState().getBlock()).getDisplayName().getString();
int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00;
HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name);
HUDHandler.drawSimpleManaHUD(color, getCurrentMana(), getMaxMana(), name);
ItemStack lens = itemHandler.getStackInSlot(0);
if(!lens.isEmpty()) {