Commit before merging upstream

This commit is contained in:
Vincent Lee committed 2015-12-14 12:46:31 -06:00
1 parent 8361d1743d
commit 6b03424e2c
22 files changed
+179 -94

No files matched your search

@@ -11,31 +11,29 @@
package vazkii.botania.client.model;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import vazkii.botania.client.lib.LibResources;
public class ModelPylon implements IPylonModel {
private IModelCustom model;
//private IModelCustom model;
// todo 1.8 restore
public ModelPylon() {
model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON));
//model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON));
}
@Override
public void renderCrystal() {
model.renderPart("Crystal");
//model.renderPart("Crystal");
}
@Override
public void renderRing() {
model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04");
//model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04");
}
@Override
public void renderGems() {
for(int i = 1; i < 5; i++)
model.renderPart("Ring_Gem0" + i);
//for(int i = 1; i < 5; i++)
//model.renderPart("Ring_Gem0" + i);
}
}