Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Reactivated AtomicReconstructor Lens Renderer

Browse source
This commit is contained in:
canitzp 2016-02-17 21:45:19 +01:00
parent 1664ce22e3
commit 0600c56355
3 changed files with 52 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java
View file

@ -11,7 +11,13 @@
package de.ellpeck.actuallyadditions.mod.blocks.render; package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.api.lens.ILensItem;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import de.ellpeck.actuallyadditions.mod.util.PosUtil;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
//TODO Fix Reconstructor Lens rendering //TODO Fix Reconstructor Lens rendering
@ -19,7 +25,7 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{
@Override @Override
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){
/*if(!(tile instanceof TileEntityAtomicReconstructor)){ if(!(tile instanceof TileEntityAtomicReconstructor)){
return; return;
} }
ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0); ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0);
@ -61,6 +67,6 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{
AssetUtil.renderItemInWorld(stack); AssetUtil.renderItemInWorld(stack);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
}*/ }
} }
} }

15
src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java
View file

@ -15,16 +15,22 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderReconstructorLens;
import de.ellpeck.actuallyadditions.mod.blocks.render.RenderSmileyCloud;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.event.InitEvents; import de.ellpeck.actuallyadditions.mod.event.InitEvents;
import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder;
import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
import de.ellpeck.actuallyadditions.mod.util.FluidStateMapper; import de.ellpeck.actuallyadditions.mod.util.FluidStateMapper;
import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.resources.IResourceManagerReloadListener;
@ -35,9 +41,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.VillagerRegistry;
import java.io.File; import java.io.File;
import java.util.Calendar; import java.util.Calendar;
@ -127,15 +135,14 @@ public class ClientProxy implements IProxy{
//TODO Fix Tile rendering //TODO Fix Tile rendering
/*ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); /*ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPhantomBooster.class, new RenderTileEntity(new ModelPhantomBooster()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBookletStand.class, new RenderTileEntity(new ModelBookletStand())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBookletStand.class, new RenderTileEntity(new ModelBookletStand()));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());*/ ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());*/
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud());
//TODO Fix villager //TODO Fix villager
//VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); //VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png"));

66
src/main/resources/assets/actuallyadditions/models/block/blockCompost.json
View file

@ -1,6 +1,6 @@
{ {
"__createdBy": "canitzp", "__createdBy": "canitzp",
"ambientocclusion": true, "ambientocclusion": false,
"textures": { "textures": {
"particle": "blocks/planks_oak", "particle": "blocks/planks_oak",
"compost": "actuallyadditions:blocks/models/modelCompost" "compost": "actuallyadditions:blocks/models/modelCompost"
@ -16,7 +16,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,2.0,2.0], "uv": [0.0,0.0,2.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,0.2,1.2,3.625], "uv": [0,0.2,1.2,3.625],
@ -46,7 +46,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,2.0,2.0], "uv": [0.0,0.0,2.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,0.4,1.2,3.625], "uv": [0,0.4,1.2,3.625],
@ -76,7 +76,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,2.0,2.0], "uv": [0.0,0.0,2.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,0.2,1.2,3.625], "uv": [0,0.2,1.2,3.625],
@ -106,7 +106,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,2.0,2.0], "uv": [0.0,0.0,2.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,0.2,1.2,3.625], "uv": [0,0.2,1.2,3.625],
@ -136,7 +136,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,1.0,10.0], "uv": [0.0,0.0,1.0,10.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,0.6,8.4,1.6], "uv": [0,0.6,8.4,1.6],
@ -148,11 +148,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
}, },
@ -166,15 +166,15 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,10.0,1.0], "uv": [0.0,0.0,10.0,1.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2.125], "uv": [0,1.375,7.5,2.125],
@ -196,7 +196,7 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,1.0,10.0], "uv": [0.0,0.0,1.0,10.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0,1.375,7.5,2.125], "uv": [0,1.375,7.5,2.125],
@ -208,11 +208,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
}, },
@ -226,15 +226,15 @@
}, },
"down": { "down": {
"uv": [0.0,0.0,10.0,1.0], "uv": [0.0,0.0,10.0,1.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2.125], "uv": [0,1.375,7.5,2.125],
@ -260,11 +260,11 @@
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2.125], "uv": [0,1.375,7.5,2.125],
@ -328,11 +328,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
}, },
@ -350,11 +350,11 @@
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2.125], "uv": [0,1.375,7.5,2.125],
@ -388,11 +388,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
}, },
@ -418,11 +418,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
}, },
@ -440,11 +440,11 @@
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2], "uv": [0,1.375,7.5,2],
@ -470,11 +470,11 @@
}, },
"west": { "west": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"east": { "east": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"north": { "north": {
"uv": [0,1.375,7.5,2], "uv": [0,1.375,7.5,2],
@ -508,11 +508,11 @@
}, },
"north": { "north": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
}, },
"south": { "south": {
"uv": [0.0,0.0,1.0,2.0], "uv": [0.0,0.0,1.0,2.0],
"texture": "missingtexture" "texture": "#compost"
} }
} }
} }