Skip to content

Commit

Permalink
1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Vazkii committed Jan 2, 2017
1 parent bf92209 commit aa42250
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ group = "vazkii.neat" // http://maven.apache.org/guides/mini/guide-naming-conven
archivesBaseName = config.mod_name

minecraft {
version = "${config.mc_version}-${config.forge_version}-${config.mc_version_suffix}"
version = "${config.mc_version}-${config.forge_version}"
runDir = "eclipse/assets"
mappings = config.mc_mappings

Expand Down
13 changes: 6 additions & 7 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#
#Thu Sep 01 03:41:40 BST 2016
#Mon Jan 02 22:59:25 GMT 2017
mod_name=Neat
forge_version=12.18.0.1986
mc_version_suffix=1.10.0
forge_version=13.20.0.2201
dir_repo=./
dir_forgecraft=D\:/Seafile/incoming/ForgeCraft2/mods
mc_mappings=snapshot_20160518
version=1.3
mc_mappings=snapshot_20161220
version=1.4
dir_output=../Build Output/Neat/
build_number=13
mc_version=1.10
build_number=14
mc_version=1.11.2
10 changes: 5 additions & 5 deletions src/main/java/vazkii/neat/HealthBarRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ public void onRenderWorldLast(RenderWorldLastEvent event) {
frustum.setPosition(viewX, viewY, viewZ);

if(NeatConfig.showOnlyFocused) {
Entity focused = getEntityLookedAt(mc.thePlayer);
Entity focused = getEntityLookedAt(mc.player);
if(focused != null && focused instanceof EntityLivingBase && focused.isEntityAlive())
renderHealthBar((EntityLivingBase) focused, partialTicks, cameraEntity);
} else {
WorldClient client = mc.theWorld;
WorldClient client = mc.world;
Set<Entity> entities = ReflectionHelper.getPrivateValue(WorldClient.class, client, new String[] { "entityList", "field_73032_d", "J" });
for(Entity entity : entities)
if(entity != null && entity instanceof EntityLivingBase && entity != mc.thePlayer && entity.isInRangeToRender3d(renderingVector.getX(), renderingVector.getY(), renderingVector.getZ()) && (entity.ignoreFrustumCheck || frustum.isBoundingBoxInFrustum(entity.getEntityBoundingBox())) && entity.isEntityAlive() && entity.getRecursivePassengers().isEmpty())
if(entity != null && entity instanceof EntityLivingBase && entity != mc.player && entity.isInRangeToRender3d(renderingVector.getX(), renderingVector.getY(), renderingVector.getZ()) && (entity.ignoreFrustumCheck || frustum.isBoundingBoxInFrustum(entity.getEntityBoundingBox())) && entity.isEntityAlive() && entity.getRecursivePassengers().isEmpty())
renderHealthBar((EntityLivingBase) entity, partialTicks, cameraEntity);
}
}
Expand Down Expand Up @@ -330,7 +330,7 @@ public static Entity getEntityLookedAt(Entity e) {
Vec3d reachVector = positionVector.addVector(lookVector.xCoord * finalDistance, lookVector.yCoord * finalDistance, lookVector.zCoord * finalDistance);

Entity lookedEntity = null;
List<Entity> entitiesInBoundingBox = e.worldObj.getEntitiesWithinAABBExcludingEntity(e, e.getEntityBoundingBox().addCoord(lookVector.xCoord * finalDistance, lookVector.yCoord * finalDistance, lookVector.zCoord * finalDistance).expand(1F, 1F, 1F));
List<Entity> entitiesInBoundingBox = e.getEntityWorld().getEntitiesWithinAABBExcludingEntity(e, e.getEntityBoundingBox().addCoord(lookVector.xCoord * finalDistance, lookVector.yCoord * finalDistance, lookVector.zCoord * finalDistance).expand(1F, 1F, 1F));
double minDistance = distance;

for(Entity entity : entitiesInBoundingBox) {
Expand Down Expand Up @@ -370,7 +370,7 @@ public static RayTraceResult raycast(Entity e, double len) {
if(look == null)
return null;

return raycast(e.worldObj, vec, look, len);
return raycast(e.getEntityWorld(), vec, look, len);
}

public static RayTraceResult raycast(World world, Vec3d origin, Vec3d ray, double len) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/vazkii/neat/Neat.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
@Mod(modid = Neat.MOD_ID, name = Neat.MOD_NAME, version = Neat.VERSION, dependencies = Neat.DEPENDENCIES, guiFactory = Neat.GUI_FACTORY, clientSideOnly = true)
public class Neat {

public static final String MOD_ID = "Neat";
public static final String MOD_NAME = MOD_ID;
public static final String MOD_ID = "neat";
public static final String MOD_NAME = "Neat";
public static final String BUILD = "GRADLE:BUILD";
public static final String VERSION = "GRADLE:VERSION-" + BUILD;
public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1909,);";
public static final String DEPENDENCIES = "";
public static final String GUI_FACTORY = "vazkii.neat.GuiFactory";

@EventHandler
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"modid": "Neat",
"modid": "neat",
"name": "Neat",
"description": "Minimalistic Functional Unit Plates for the modern Minecrafter",
"version": "${version}",
Expand Down

0 comments on commit aa42250

Please sign in to comment.