Skip to content
This repository has been archived by the owner on Jul 1, 2021. It is now read-only.

Update numbers to represent actual damage numers rather than halved numbers #22

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.12-1.14"
version = "1.12-1.14.1"
group= "boni" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "MmmMmmMmmMmm"

minecraft {
version = "1.12.2-14.23.0.2512"
version = "1.12.2-14.23.5.2847"
runDir = "run"
mappings = "snapshot_20171010"
mappings = "stable_39"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/boni/dummy/ItemDummy.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class ItemDummy extends Item {

public ItemDummy() {
this.setUnlocalizedName("dummy");
this.setTranslationKey("dummy");
this.setRegistryName("dummy");
this.setCreativeTab(CreativeTabs.COMBAT);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/boni/dummy/client/RenderFloatingNumber.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void doRender(EntityFloatingNumber entity, double x, double y, double z,
GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);

// draw it
String s = df.format(entity.damage / 2f);
String s = df.format(entity.damage);
if(dps) {
s = "DPS: " + s;
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/boni/dummy/network/DamageMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;

import java.text.DecimalFormat;

import boni.dummy.EntityDummy;
import boni.dummy.EntityFloatingNumber;
import io.netty.buffer.ByteBuf;
Expand Down Expand Up @@ -46,6 +48,8 @@ public void toBytes(ByteBuf buf) {

public static class MessageHandlerClient implements IMessageHandler<DamageMessage, IMessage> {

private static DecimalFormat df = new DecimalFormat("#.##");

@Override
public DamageMessage onMessage(final DamageMessage message, MessageContext ctx) {
FMLCommonHandler.instance().getWorldThread(ctx.netHandler).addScheduledTask(new Runnable() {
Expand All @@ -55,7 +59,7 @@ public void run() {
if(entity != null && entity instanceof EntityDummy) {
EntityDummy dummy = (EntityDummy) entity;
dummy.shake = message.shakeAmount;
dummy.setCustomNameTag(String.valueOf(message.damage / 2f));
dummy.setCustomNameTag(String.valueOf(df.format(message.damage)));
}
if(message.nrID > 0) {
entity = Minecraft.getMinecraft().world.getEntityByID(message.nrID);
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/testdummy/lang/en_US.lang
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
item.dummy.name=Test Dummy
tile.dummy.name=Test Dummy
tile.dummy.name=Test Dummy
entity.Dummy.name=Test Dummy
1 change: 1 addition & 0 deletions src/main/resources/assets/testdummy/lang/zh_CN.lang
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
item.dummy.name=试验假人
tile.dummy.name=试验假人
entity.Dummy.name=试验假人