Add travis config

Also another itemstack == null
This commit is contained in:
Matthew Messinger 2017-02-13 23:26:21 -05:00
parent 82955e26dd
commit a1cb565275
6 changed files with 7 additions and 12 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "ForgeGradle-LiteLoader"]
path = buildSrc
url = https://github.com/killjoy1221/ForgeGradle-LiteLoader

3
.travis.yml Normal file
View file

@ -0,0 +1,3 @@
language: java
jdk:
- oraclejdk8

View file

@ -5,10 +5,6 @@ buildscript {
name 'forge' name 'forge'
url 'http://files.minecraftforge.net/maven' url 'http://files.minecraftforge.net/maven'
} }
maven {
name 'm2'
url 'https://plugins.gradle.org/m2'
}
maven { maven {
name = 'sponge' name = 'sponge'
url = 'http://repo.spongepowered.org/maven' url = 'http://repo.spongepowered.org/maven'
@ -24,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle.liteloader'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
group = 'com.minelittlepony' group = 'com.minelittlepony'
version = '1.11.2.1' version = '1.11.2.2-SNAPSHOT'
description = 'Mine Little Pony' description = 'Mine Little Pony'
targetCompatibility = 1.8 targetCompatibility = 1.8

View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Fri Jan 06 18:22:59 EST 2017 #Wed Feb 01 15:58:53 EST 2017
build.number=301 build.number=310

@ -1 +0,0 @@
Subproject commit 7f6a9b2e44fc9496be253f1595b8585958e04c01

View file

@ -61,7 +61,7 @@ public class LayerPonyArmor implements LayerRenderer<EntityLivingBase> {
EntityEquipmentSlot armorSlot) { EntityEquipmentSlot armorSlot) {
ItemStack itemstack = entity.getItemStackFromSlot(armorSlot); ItemStack itemstack = entity.getItemStackFromSlot(armorSlot);
if (itemstack != null && itemstack.getItem() instanceof ItemArmor) { if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) {
ItemArmor itemarmor = (ItemArmor) itemstack.getItem(); ItemArmor itemarmor = (ItemArmor) itemstack.getItem();
boolean isLegs = armorSlot == EntityEquipmentSlot.LEGS; boolean isLegs = armorSlot == EntityEquipmentSlot.LEGS;