dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove IModelRegistration

Browse Source
This commit is contained in:
raoulvdberge
2019-10-18 21:15:43 +02:00
parent cc0adab112
commit 4a8ddeeb6d
3 changed files with 2 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
View File

@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.block.info.BlockDirection; import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
import com.raoulvdberge.refinedstorage.block.info.IBlockInfo; import com.raoulvdberge.refinedstorage.block.info.IBlockInfo;
import com.raoulvdberge.refinedstorage.item.blockitem.ItemBlockBase; import com.raoulvdberge.refinedstorage.item.blockitem.ItemBlockBase;
import com.raoulvdberge.refinedstorage.render.IModelRegistration;
import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup; import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@@ -14,8 +13,6 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections; import java.util.Collections;
@@ -43,10 +40,6 @@ public abstract class BlockBase extends Block {
super(p_i48440_1_); super(p_i48440_1_);
} }
@OnlyIn(Dist.CLIENT)
public void registerModels(IModelRegistration modelRegistration) {
}
@Override @Override
public String getTranslationKey() { public String getTranslationKey() {
return "block." + info.getId().toString(); return "block." + info.getId().toString();

59
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
View File

@@ -1,65 +1,10 @@
package com.raoulvdberge.refinedstorage.proxy; package com.raoulvdberge.refinedstorage.proxy;
import com.raoulvdberge.refinedstorage.render.IModelRegistration; public class ProxyClient extends ProxyCommon {
import net.minecraft.block.Block; /*@Override
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ICustomModelLoader;
import java.util.function.Function;
import java.util.function.Supplier;
public class ProxyClient extends ProxyCommon implements IModelRegistration {
@Override
public void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override) {
}
@Override
public void setModel(Block block, int meta, ModelResourceLocation resource) {
}
@Override
public void setModel(Item item, int meta, ModelResourceLocation resource) {
}
@Override
public void setModelVariants(Item item, ResourceLocation... variants) {
}
@Override
public void addModelLoader(Supplier<ICustomModelLoader> modelLoader) {
}
@Override
public <T extends TileEntity> void setTesr(Class<T> tile, TileEntityRenderer<T> tesr) {
}
@Override
public void addItemColor(Item item, IItemColor itemColor) {
}
/*
@Override
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
super.preInit(e); super.preInit(e);
MinecraftForge.EVENT_BUS.register(new KeyInputListener()); MinecraftForge.EVENT_BUS.register(new KeyInputListener());
}
@Override
public void setTesr(Class<? extends TileEntity> tile, TileEntitySpecialRenderer tesr) {
ClientRegistry.bindTileEntitySpecialRenderer(tile, tesr);
}*/ }*/
} }

31
src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java
View File

@@ -1,31 +0,0 @@
package com.raoulvdberge.refinedstorage.render;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ICustomModelLoader;
import java.util.function.Function;
import java.util.function.Supplier;
public interface IModelRegistration {
void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override);
void setModel(Block block, int meta, ModelResourceLocation resource); // ModelLoader.setCustomModelResourceLocation -> no longer needed due to flattening, for custom, use custom baked model
void setModel(Item item, int meta, ModelResourceLocation resource); // same as above
void setModelVariants(Item item, ResourceLocation... variants); // no longer needed
// Supplier needed to avoid server crash.
void addModelLoader(Supplier<ICustomModelLoader> modelLoader);
<T extends TileEntity> void setTesr(Class<T> tile, TileEntityRenderer<T> tesr);
void addItemColor(Item item, IItemColor itemColor);
}