Fixed java6 errors in previous commit.
This commit is contained in:
parent
86c09722a0
commit
7c4d643de2
|
@ -34,7 +34,7 @@ import com.google.gson.JsonParser;
|
|||
|
||||
public class MultiLayerModel implements IModelCustomData
|
||||
{
|
||||
public static final MultiLayerModel instance = new MultiLayerModel(ImmutableMap.of());
|
||||
public static final MultiLayerModel instance = new MultiLayerModel(ImmutableMap.<Optional<EnumWorldBlockLayer>, ModelResourceLocation>of());
|
||||
|
||||
private final ImmutableMap<Optional<EnumWorldBlockLayer>, ModelResourceLocation> models;
|
||||
|
||||
|
@ -75,7 +75,7 @@ public class MultiLayerModel implements IModelCustomData
|
|||
{
|
||||
if("base".equals(key))
|
||||
{
|
||||
builder.put(Optional.absent(), getLocation(customData.get(key)));
|
||||
builder.put(Optional.<EnumWorldBlockLayer>absent(), getLocation(customData.get(key)));
|
||||
}
|
||||
for(EnumWorldBlockLayer layer : EnumWorldBlockLayer.values())
|
||||
{
|
||||
|
@ -122,7 +122,7 @@ public class MultiLayerModel implements IModelCustomData
|
|||
if(base == null)
|
||||
{
|
||||
ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager();
|
||||
base = getModel(manager, Optional.absent());
|
||||
base = getModel(manager, Optional.<EnumWorldBlockLayer>absent());
|
||||
|
||||
ImmutableMap.Builder<EnumWorldBlockLayer, IBakedModel> builder = ImmutableMap.builder();
|
||||
for(EnumWorldBlockLayer layer : EnumWorldBlockLayer.values())
|
||||
|
@ -135,7 +135,7 @@ public class MultiLayerModel implements IModelCustomData
|
|||
bakedModels = builder.build();
|
||||
|
||||
ImmutableMap.Builder<Optional<EnumFacing>, ImmutableList<BakedQuad>> quadBuilder = ImmutableMap.builder();
|
||||
quadBuilder.put(Optional.absent(), buildQuads(Optional.absent()));
|
||||
quadBuilder.put(Optional.<EnumFacing>absent(), buildQuads(Optional.<EnumFacing>absent()));
|
||||
for(EnumFacing side: EnumFacing.values())
|
||||
{
|
||||
quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side)));
|
||||
|
|
|
@ -55,7 +55,7 @@ public class FMLPostInitializationEvent extends FMLStateEvent
|
|||
* @param className The name of the class I wish to instantiate
|
||||
* @return An optional containing the object if possible, or null if not
|
||||
*/
|
||||
public Optional<Object> buildSoftDependProxy(String modId, String className, Object... arguments)
|
||||
public Optional<?> buildSoftDependProxy(String modId, String className, Object... arguments)
|
||||
{
|
||||
if (Loader.isModLoaded(modId))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue