xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Optimization' into Optimization

Browse Source 
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/util/CompatExternal.java
This commit is contained in:
BallOfEnergy 2024-12-16 18:25:14 -06:00
commit 7a16a8ba9f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/hbm/util/CompatExternal.java
View File

@ -1,8 +1,5 @@
package com.hbm.util;
import api.hbm.energymk2.IEnergyHandlerMK2;
import api.hbm.energymk2.IEnergyReceiverMK2;
import api.hbm.fluid.IFluidUser;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@ -10,6 +7,9 @@ import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import api.hbm.energymk2.IEnergyHandlerMK2;
import api.hbm.energymk2.IEnergyReceiverMK2;
import api.hbm.fluid.IFluidUser;
import com.hbm.blocks.BlockDummyable;
import com.hbm.entity.missile.EntityMissileCustom;
import com.hbm.explosion.ExplosionNukeSmall;
@ -27,6 +27,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.function.BiFunction;
/**
* EXTERNAL COMPATIBILITY CLASS - DO NOT CHANGE METHOD NAMES/PARAMS ONCE CREATED
* Is there a smarter way to do this? Most likely. Is there an easier one? Probably not.

2
src/main/java/com/hbm/util/EntityDamageUtil.java
View File

@ -19,8 +19,6 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import java.lang.reflect.Method;
public class EntityDamageUtil {
public static boolean attackEntityFromIgnoreIFrame(Entity victim, DamageSource src, float damage) {