icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unbroke

Browse Source
This commit is contained in:
gnembon committed 2019-05-11 11:20:56 -03:00
1 parent 71c07b63fd
commit 49118ce503
10 files changed
+98 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/logging/LoggerRegistry.java
+5 -6
View File
@@ -1,9 +1,8 @@
package carpet.logging;
import carpet.CarpetSettings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.server.MinecraftServer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.DyeColor;
import java.lang.reflect.Field;
import java.util.Arrays;
@@ -40,7 +39,7 @@ public class LoggerRegistry
registerLogger("tps", new HUDLogger("tps", null, null));
registerLogger("packets", new HUDLogger("packets", null, null));
registerLogger("counter",new HUDLogger("counter","white", Arrays.stream(EnumDyeColor.values()).map(Object::toString).toArray(String[]::new)));
registerLogger("counter",new HUDLogger("counter","white", Arrays.stream(DyeColor.values()).map(Object::toString).toArray(String[]::new)));
registerLogger("mobcaps", new HUDLogger("mobcaps", "dynamic",new String[]{"dynamic", "overworld", "nether","end"}));
}
@@ -136,7 +135,7 @@ public class LoggerRegistry
setAccess(logger);
}
public static void playerConnected(EntityPlayer player)
public static void playerConnected(PlayerEntity player)
{
for(Logger log: loggerRegistry.values() )
{
@@ -144,7 +143,7 @@ public class LoggerRegistry
}
}
public static void playerDisconnected(EntityPlayer player)
public static void playerDisconnected(PlayerEntity player)
{
for(Logger log: loggerRegistry.values() )
{
src/main/java/carpet/logging/logHelpers/DamageReporter.java
+20 -20
View File
@@ -3,28 +3,28 @@ package carpet.logging.logHelpers;
import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.util.DamageSource;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.network.chat.BaseComponent;
import java.util.function.Supplier;
public class DamageReporter
{
private static ITextComponent[] verifyAndProduceMessage(String option, EntityPlayer player, Entity from, Entity to, Supplier<ITextComponent> messageFuture)
private static BaseComponent[] verifyAndProduceMessage(String option, PlayerEntity player, Entity from, Entity to, Supplier<BaseComponent> messageFuture)
{
if ("all".equalsIgnoreCase(option)
|| ("players".equalsIgnoreCase(option) && (from instanceof EntityPlayer || to instanceof EntityPlayer))
|| ("players".equalsIgnoreCase(option) && (from instanceof PlayerEntity || to instanceof PlayerEntity))
|| ("me".equalsIgnoreCase(option) && ( (from == player) || ( to == player) ) ))
{
return new ITextComponent[]{messageFuture.get()};
return new BaseComponent[]{messageFuture.get()};
}
return null;
}
public static boolean register_damage_attacker(Entity target, EntityLivingBase source, float amount)
public static boolean register_damage_attacker(Entity target, LivingEntity source, float amount)
{
if (!LoggerRegistry.__damage) return true;
LoggerRegistry.getLogger("damage").log( (option, player)->
@@ -37,27 +37,27 @@ public class DamageReporter
return true;
}
public static void register_damage(EntityLivingBase target, DamageSource source, float amount)
public static void register_damage(LivingEntity target, DamageSource source, float amount)
{
if (!LoggerRegistry.__damage) return;
if (source.isFireDamage() && (target.isImmuneToFire() ||
target.isPotionActive(MobEffects.FIRE_RESISTANCE)))
if (source.isFire() && (target.isFireImmune() ||
target.hasStatusEffect(StatusEffects.FIRE_RESISTANCE)))
return;
LoggerRegistry.getLogger("damage").log( (option, player)->
verifyAndProduceMessage(option, player, source.getTrueSource(), target, () ->
verifyAndProduceMessage(option, player, source.getSource(), target, () ->
Messenger.c(target.getDisplayName(),
"g receiving ",
String.format("r %.2f", amount),
String.format("g points of damage from %s", source.getDamageType()))
String.format("g points of damage from %s", source.getName()))
)
);
}
public static void register_final_damage(EntityLivingBase target, DamageSource source, float amount)
public static void register_final_damage(LivingEntity target, DamageSource source, float amount)
{
if (!LoggerRegistry.__damage) return;
LoggerRegistry.getLogger("damage").log( (option, player)->
verifyAndProduceMessage(option, player, source.getTrueSource(), target, () ->
verifyAndProduceMessage(option, player, source.getSource(), target, () ->
Messenger.c("g - total received ",
String.format("r %.2f", amount),
"g points of damage")
@@ -65,17 +65,17 @@ public class DamageReporter
);
}
public static void modify_damage(EntityLivingBase target, DamageSource source, float previous_amount, float final_amount, String component)
public static void modify_damage(LivingEntity target, DamageSource source, float previous_amount, float final_amount, String component)
{
if (!LoggerRegistry.__damage)
return;
if (previous_amount == final_amount)
return;
if (source.isFireDamage() && (target.isImmuneToFire() ||
target.isPotionActive(MobEffects.FIRE_RESISTANCE)))
if (source.isFire() && (target.isFireImmune() ||
target.hasStatusEffect(StatusEffects.FIRE_RESISTANCE)))
return;
LoggerRegistry.getLogger("damage").log( (option, player)->
verifyAndProduceMessage(option, player, source.getTrueSource(), target, () ->
verifyAndProduceMessage(option, player, source.getSource(), target, () ->
{
if (final_amount == 0.0f)
{
src/main/java/carpet/logging/logHelpers/KillLogHelper.java
+4 -4
View File
@@ -2,25 +2,25 @@ package carpet.logging.logHelpers;
import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.network.chat.BaseComponent;
public class KillLogHelper {
public static void onSweep(String name, int count)
{
LoggerRegistry.getLogger("kills").log( () -> new ITextComponent[]{
LoggerRegistry.getLogger("kills").log( () -> new BaseComponent[]{
Messenger.c("g "+name+" smacked ","r "+count,"g entities with sweeping")});
}
public static void onNonSweepAttack(String name)
{
LoggerRegistry.getLogger("kills").log( () -> new ITextComponent[]{
LoggerRegistry.getLogger("kills").log( () -> new BaseComponent[]{
Messenger.c("g "+name+" smacked ","r 1","g (no sweeping)")});
}
public static void onDudHit(String name)
{
LoggerRegistry.getLogger("kills").log( () -> new ITextComponent[]{
LoggerRegistry.getLogger("kills").log( () -> new BaseComponent[]{
Messenger.c("g "+name+" dud hot = no one affected")});
}
}
src/main/java/carpet/logging/logHelpers/TNTLogHelper.java
+3 -3
View File
@@ -2,7 +2,7 @@ package carpet.logging.logHelpers;
import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.network.chat.BaseComponent;
public class TNTLogHelper
{
@@ -26,11 +26,11 @@ public class TNTLogHelper
switch (option)
{
case "brief":
return new ITextComponent[]{Messenger.c(
return new BaseComponent[]{Messenger.c(
"l P ",Messenger.dblt("l",primedX,primedY,primedZ,primedAngle),
"r E ",Messenger.dblt("r",x, y, z))};
case "full":
return new ITextComponent[]{Messenger.c(
return new BaseComponent[]{Messenger.c(
"l P ",Messenger.dblf("l",primedX,primedY,primedZ,primedAngle),
"r E ",Messenger.dblf("r",x, y, z))};
}
src/main/java/carpet/logging/logHelpers/TrajectoryLogHelper.java
+3 -3
View File
@@ -4,7 +4,7 @@ import carpet.logging.Logger;
import carpet.logging.LoggerRegistry;
import carpet.utils.Messenger;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.network.chat.BaseComponent;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +39,7 @@ public class TrajectoryLogHelper
{
if (!doLog) return;
logger.log( (option) -> {
List<ITextComponent> comp = new ArrayList<>();
List<BaseComponent> comp = new ArrayList<>();
switch (option)
{
case "brief":
@@ -72,7 +72,7 @@ public class TrajectoryLogHelper
}
break;
}
return comp.toArray(new ITextComponent[0]);
return comp.toArray(new BaseComponent[0]);
});
doLog = false;
}