Fix #1084 and Remove New Bee House Model

This commit is contained in:
Nedelosk committed 2016-03-02 21:59:45 +01:00
1 parent 4b2d7594cb
commit 87f2dc0a0a
49 files changed
+126 -889

No files matched your search

-1
View File
@@ -96,7 +96,6 @@ public class Forestry {
PluginManager.runPreInit();
Proxies.render.registerLoaders();
Proxies.render.registerModels();
}
@@ -15,12 +15,11 @@ import javax.annotation.Nonnull;
import forestry.apiculture.tiles.TileApiary;
import forestry.apiculture.tiles.TileBeeHouse;
import forestry.core.blocks.IBlockType;
import forestry.core.blocks.IBlockTypeCustom;
import forestry.core.blocks.IMachineProperties;
import forestry.core.blocks.MachineProperties;
import forestry.core.tiles.TileForestry;
public enum BlockTypeApiculture implements IBlockTypeCustom {
public enum BlockTypeApiculture implements IBlockType {
APIARY(0, TileApiary.class, "apiary"),
BEE_HOUSE(1, TileBeeHouse.class, "bee.house");
@@ -12,14 +12,13 @@ package forestry.apiculture.items;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -35,7 +34,7 @@ import forestry.core.items.ItemWithGui;
import forestry.core.utils.StringUtil;
public class ItemHabitatLocator extends ItemWithGui {
private static final String iconName = "forestry:biomefinder";
private static final String iconName = "forestry:items/biomefinder";
private final HabitatLocatorLogic locatorLogic;
@@ -56,15 +55,11 @@ public class ItemHabitatLocator extends ItemWithGui {
}
}
/* TEXTURES */
/* SPRITES */
@SideOnly(Side.CLIENT)
public static TextureAtlasSprite sprite;
@SideOnly(Side.CLIENT)
public static void registerIcon(TextureMap map) {
public static void registerSprite() {
TextureAtlasSprite texture = new TextureHabitatLocator(iconName);
map.setTextureEntry("forestry:biomefinder", texture);
sprite = texture;
Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(iconName, texture);
}
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -93,9 +93,6 @@ public class ProxyRender {
public void registerModels() {
}
public void registerLoaders() {
}
/* FX */
@@ -34,8 +34,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.b3d.B3DLoader;
import net.minecraftforge.client.model.obj.OBJLoader;
import forestry.apiculture.entities.EntityFXBee;
import forestry.apiculture.render.ParticleRenderer;
import forestry.apiculture.render.TextureHabitatLocator;
@@ -146,12 +144,6 @@ public class ProxyRenderClient extends ProxyRender {
public void registerStateMapper(Block block, IStateMapper mapper) {
ModelLoader.setCustomStateMapper(block, mapper);
}
@Override
public void registerLoaders() {
B3DLoader.instance.addDomain(Constants.ID);
OBJLoader.instance.addDomain(Constants.ID);
}
@Override
public void registerModels() {
@@ -198,7 +198,8 @@ public class AlleleButterflySpecies extends AlleleSpecies<ButterflyChromosome> i
@Override
public void registerSprites() {
Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(texture.replace(".png", "").replace("textures/", ""), new TextureAtlasButterfly(texture.replace(".png", "").replace("textures/", "")));
String spriteName = texture.replace(".png", "").replace("textures/", "").replace("entity", "items");
Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(spriteName, new TextureAtlasButterfly(spriteName));
}
@Override
@@ -11,8 +11,11 @@
package forestry.lepidopterology.proxy;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import forestry.core.models.ModelIndex;
import forestry.core.models.ModelManager;
import forestry.core.proxy.Proxies;
import forestry.lepidopterology.entities.EntityButterfly;
import forestry.lepidopterology.render.ModelButterflyItem;
import forestry.lepidopterology.render.RenderButterflyEntity;
public class ProxyLepidopterologyClient extends ProxyLepidopterology {
@@ -20,6 +23,6 @@ public class ProxyLepidopterologyClient extends ProxyLepidopterology {
@Override
public void initializeRendering() {
RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity());
//Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation(PluginLepidopterology.items.butterflyGE, "butterflyGE"), new ModelButterflyItem()));
Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation("butterflyGE"), new ModelButterflyItem()));
}
}
@@ -22,6 +22,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.resources.model.ModelRotation;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
@@ -33,18 +34,10 @@ import net.minecraftforge.client.model.ModelLoaderRegistry;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.IButterfly;
import forestry.core.models.TRSRBakedModel;
import forestry.core.utils.Log;
public class ModelButterflyItem implements ISmartItemModel {
public IRetexturableModel modelButterfly;
public ResourceLocation location;
public ModelButterflyItem() {
this.location = new ResourceLocation("forestry:item/butterflyGE.b3d");
//this.location = new ResourceLocation("forestry:item/butterflyGE.obj");
}
@Override
public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) {
@@ -85,9 +78,9 @@ public class ModelButterflyItem implements ISmartItemModel {
public IBakedModel handleItemState(ItemStack item) {
if (modelButterfly == null) {
try {
modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(location);
modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(new ModelResourceLocation("forestry:butterflyGE", "inventory"));
} catch (IOException e) {
Log.warning("Failed to find Butterfly Model for (" + location + ") in the Forestry registry.");
return null;
}
if (modelButterfly == null) {
return null;
@@ -98,40 +91,14 @@ public class ModelButterflyItem implements ISmartItemModel {
butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate());
}
return bakeModel(butterfly);
//return bakeModel(butterfly);
}
public IBakedModel bakeModel(IButterfly butterfly) {
Function<ResourceLocation, TextureAtlasSprite> textureGetter = new ButterflyTextureGetter();
ImmutableMap.Builder<String, String> textures = ImmutableMap.builder();
textures.put("#ButterflyGE", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", ""));
textures.put("Butterfly2texture", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", ""));
textures.put("butterfly", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", "").replace("entity", "items"));
modelButterfly = (IRetexturableModel) modelButterfly.retexture(textures.build());
return new TRSRBakedModel(modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.5F, -1.5F, 1.5F, 0, (float) Math.PI * 2, 0, 1F);
}
public static float getIrregularWingYaw(long flapping, float flap) {
long irregular = flapping / 1024;
float wingYaw;
if (irregular % 11 == 0) {
wingYaw = 0.75f;
} else {
if (irregular % 7 == 0) {
flap *= 4;
flap = flap % 1;
} else if (irregular % 19 == 0) {
flap *= 6;
flap = flap % 1;
}
wingYaw = getRegularWingYaw(flap);
}
return wingYaw;
}
private static float getRegularWingYaw(float flap) {
return flap < 0.5 ? 0.75f + flap : 1.75f - flap;
return modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter);
}
private static class ButterflyTextureGetter implements Function<ResourceLocation, TextureAtlasSprite> {