mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 04:22:32 +00:00
1 parent
9e33648920
commit
43ac71b022
7 files changed
+40
-709
No files matched your search
@@ -19,7 +19,6 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
||||
@@ -23,9 +23,12 @@ import java.io.StringReader;
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.vecmath.Vector3f;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ModelBlock;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
@@ -40,8 +43,12 @@ import net.minecraftforge.client.ItemModelMesherForge;
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.IFlexibleBakedModel;
|
||||
import net.minecraftforge.client.model.IModel;
|
||||
import net.minecraftforge.client.model.IModelState;
|
||||
import net.minecraftforge.client.model.IPerspectiveAwareModel;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.MultiModel;
|
||||
import net.minecraftforge.client.model.SimpleModelState;
|
||||
import net.minecraftforge.client.model.TRSRTransformation;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -73,7 +80,8 @@ public class ModelCrate extends BlankItemModel {
|
||||
MODEL_COMPASS = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 15);
|
||||
MODEL_CLOCK = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 16);
|
||||
} catch (IOException e) {
|
||||
Log.error("Failed to bake crate model model.");
|
||||
Log.error("Failed to init the crate model.");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -200,10 +208,10 @@ public class ModelCrate extends BlankItemModel {
|
||||
/**
|
||||
* Bake the crate model;
|
||||
*/
|
||||
private IFlexibleBakedModel getModelCrate() {
|
||||
/*private IFlexibleBakedModel getModelCrate() {
|
||||
IFlexibleBakedModel flexModel = getModel(new ItemStack(PluginStorage.items.crate, 1, 1));
|
||||
return crateModel.bake(crateModel.getDefaultState(), flexModel.getFormat(), textureGetter);
|
||||
}
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Bake the crated model
|
||||
@@ -213,16 +221,29 @@ public class ModelCrate extends BlankItemModel {
|
||||
ItemCrated crated = (ItemCrated) stack.getItem();
|
||||
String crateUID = StringUtil.cleanItemName(crated);
|
||||
if (crates.get(crateUID) == null) {
|
||||
IFlexibleBakedModel baseBaked = getModelCrate();
|
||||
|
||||
IFlexibleBakedModel baseBaked = getModel(new ItemStack(PluginStorage.items.crate, 1, 1));
|
||||
//Set the crate color index to 100
|
||||
for (BakedQuad quad : baseBaked.getGeneralQuads()) {
|
||||
ObfuscationReflectionHelper.setPrivateValue(BakedQuad.class, quad, 100, 1);
|
||||
}
|
||||
crates.put(crateUID, new MultiModel.Baked(baseBaked, bakeContentModels(crated)));
|
||||
crates.put(crateUID, new MultiModel.Baked(null, true, new IPerspectiveAwareModel.MapWrapper(baseBaked, getTransformations()), bakeContentModels(crated)));
|
||||
}
|
||||
return crates.get(crateUID);
|
||||
}
|
||||
|
||||
public IModelState getTransformations(){
|
||||
TRSRTransformation thirdperson = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(
|
||||
new Vector3f(0, 1f / 16, -3f / 16),
|
||||
TRSRTransformation.quatFromYXZDegrees(new Vector3f(-90, 0, 0)),
|
||||
new Vector3f(0.55f, 0.55f, 0.55f),
|
||||
null));
|
||||
TRSRTransformation firstperson = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(
|
||||
new Vector3f(0, 4f / 16, 2f / 16),
|
||||
TRSRTransformation.quatFromYXZDegrees(new Vector3f(0, -135, 25)),
|
||||
new Vector3f(1.7f, 1.7f, 1.7f),
|
||||
null));
|
||||
return new SimpleModelState(ImmutableMap.of(TransformType.THIRD_PERSON, thirdperson, TransformType.FIRST_PERSON, firstperson));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() {
|
||||
|
||||
@@ -40,7 +40,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer<TileEscritoire>
|
||||
if (escritoire != null) {
|
||||
render(escritoire.getStackInSlot(InventoryEscritoire.SLOT_ANALYZE), escritoire.getOrientation(), x, y, z);
|
||||
} else {
|
||||
render(null, EnumFacing.EAST, x, y, z);
|
||||
render(null, EnumFacing.SOUTH, x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import forestry.core.gui.widgets.ItemStackWidgetBase;
|
||||
import forestry.core.gui.widgets.WidgetManager;
|
||||
import forestry.core.proxy.Proxies;
|
||||
|
||||
@@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -23,8 +22,6 @@ import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
import net.minecraftforge.fml.common.event.FMLInterModComms;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
|
||||
Reference in new issue
Block a user