change: reduce communication gui size above scale factor 3
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
parent
bdec1683c2
commit
ffe591aa39
5 changed files with 11 additions and 9 deletions
|
@ -11,7 +11,6 @@ import ru.octol1ttle.knockdowns.client.communication.KnockedNotificationManager;
|
||||||
import ru.octol1ttle.knockdowns.client.event.KnockdownsKeyListener;
|
import ru.octol1ttle.knockdowns.client.event.KnockdownsKeyListener;
|
||||||
import ru.octol1ttle.knockdowns.client.util.DirectionalCallSound;
|
import ru.octol1ttle.knockdowns.client.util.DirectionalCallSound;
|
||||||
import ru.octol1ttle.knockdowns.common.IClientProxy;
|
import ru.octol1ttle.knockdowns.common.IClientProxy;
|
||||||
import ru.octol1ttle.knockdowns.common.KnockdownsMod;
|
|
||||||
import ru.octol1ttle.knockdowns.common.data.IKnockdownsPlayerData;
|
import ru.octol1ttle.knockdowns.common.data.IKnockdownsPlayerData;
|
||||||
import ru.octol1ttle.knockdowns.common.network.packets.s2c.PlayerCalloutS2CPacket;
|
import ru.octol1ttle.knockdowns.common.network.packets.s2c.PlayerCalloutS2CPacket;
|
||||||
import ru.octol1ttle.knockdowns.common.network.packets.s2c.PlayerKnockedDownS2CPacket;
|
import ru.octol1ttle.knockdowns.common.network.packets.s2c.PlayerKnockedDownS2CPacket;
|
||||||
|
@ -27,7 +26,6 @@ public class ClientProxy implements IClientProxy {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFMLInit(FMLInitializationEvent event) {
|
public void onFMLInit(FMLInitializationEvent event) {
|
||||||
KnockdownsMod.LOGGER.info("Registering key bindings");
|
|
||||||
KnockdownsKeyListener.registerKeyBindings();
|
KnockdownsKeyListener.registerKeyBindings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,10 +34,16 @@ public class CommunicationGui extends KnockdownsBaseGui {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(float partialTicks, ScaledResolution resolution) {
|
public void render(float partialTicks, ScaledResolution resolution) {
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
|
float scale = 1.0f;
|
||||||
|
if (resolution.getScaleFactor() > 3) {
|
||||||
|
scale = (float) 3 / resolution.getScaleFactor();
|
||||||
|
GlStateManager.scale(scale, scale, 1.0f);
|
||||||
|
}
|
||||||
FontRenderer font = client.fontRenderer;
|
FontRenderer font = client.fontRenderer;
|
||||||
|
|
||||||
int x = SCREEN_EDGE_MARGIN;
|
int x = SCREEN_EDGE_MARGIN;
|
||||||
int y = resolution.getScaledHeight() - SCREEN_EDGE_MARGIN - font.FONT_HEIGHT;
|
int y = (int) (resolution.getScaledHeight() / scale - SCREEN_EDGE_MARGIN - font.FONT_HEIGHT);
|
||||||
|
|
||||||
KeyBinding[] sortedBindings = new KeyBinding[4];
|
KeyBinding[] sortedBindings = new KeyBinding[4];
|
||||||
for (KeyBinding binding : KnockdownsKeyListener.calloutBindings.keySet())
|
for (KeyBinding binding : KnockdownsKeyListener.calloutBindings.keySet())
|
||||||
|
@ -135,6 +141,8 @@ public class CommunicationGui extends KnockdownsBaseGui {
|
||||||
KEY_SIZE
|
KEY_SIZE
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GlStateManager.popMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderCallouts(float partialTicks) {
|
public void renderCallouts(float partialTicks) {
|
||||||
|
|
|
@ -45,15 +45,14 @@ import static ru.octol1ttle.knockdowns.common.KnockdownsUtils.resetKnockedState;
|
||||||
@Mod.EventBusSubscriber(modid = Tags.MOD_ID)
|
@Mod.EventBusSubscriber(modid = Tags.MOD_ID)
|
||||||
public class KnockdownsCommonEventListener {
|
public class KnockdownsCommonEventListener {
|
||||||
public static void onFMLInit(FMLInitializationEvent event) {
|
public static void onFMLInit(FMLInitializationEvent event) {
|
||||||
KnockdownsMod.LOGGER.info("Registering network packets");
|
|
||||||
KnockdownsNetwork.registerPackets();
|
KnockdownsNetwork.registerPackets();
|
||||||
KnockdownsMod.LOGGER.info("Registering capability");
|
|
||||||
KnockdownsCapability.register();
|
KnockdownsCapability.register();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onSoundsRegister(RegistryEvent.Register<SoundEvent> event) {
|
public static void onSoundsRegister(RegistryEvent.Register<SoundEvent> event) {
|
||||||
event.getRegistry().register(KnockdownsSoundEvents.CALLOUT);
|
event.getRegistry().register(KnockdownsSoundEvents.CALLOUT);
|
||||||
|
event.getRegistry().register(KnockdownsSoundEvents.KNOCKED_DOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
|
@ -131,7 +130,6 @@ public class KnockdownsCommonEventListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.isKnockedDown() || allPlayersKnocked(player.getServer(), player)) {
|
if (data.isKnockedDown() || allPlayersKnocked(player.getServer(), player)) {
|
||||||
data.getRevivers().clear();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@ public class KnockdownsMod {
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void onFMLInit(FMLInitializationEvent event) {
|
public void onFMLInit(FMLInitializationEvent event) {
|
||||||
LOGGER.info("Initializing");
|
|
||||||
clientProxy.onFMLInit(event);
|
clientProxy.onFMLInit(event);
|
||||||
KnockdownsCommonEventListener.onFMLInit(event);
|
KnockdownsCommonEventListener.onFMLInit(event);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,12 +32,11 @@ public class KnockdownsUtils {
|
||||||
data.setKnockedDown(false);
|
data.setKnockedDown(false);
|
||||||
data.setReviveTimeLeft(INITIAL_REVIVE_TIME_LEFT);
|
data.setReviveTimeLeft(INITIAL_REVIVE_TIME_LEFT);
|
||||||
data.setTicksKnocked(0);
|
data.setTicksKnocked(0);
|
||||||
|
data.getRevivers().clear();
|
||||||
|
|
||||||
KnockdownsNetwork.sendToTrackingAndSelf(
|
KnockdownsNetwork.sendToTrackingAndSelf(
|
||||||
new SynchronizePlayerDataS2CPacket.KnockedDown(player.getEntityId(), data.isKnockedDown()),
|
new SynchronizePlayerDataS2CPacket.KnockedDown(player.getEntityId(), data.isKnockedDown()),
|
||||||
player
|
player
|
||||||
);
|
);
|
||||||
|
|
||||||
data.getRevivers().clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue