mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-15 19:53:41 +01:00
Housekeeping.
This commit is contained in:
parent
8ce0f47f01
commit
b31f4d09bd
9 changed files with 10 additions and 10 deletions
|
@ -15,7 +15,7 @@ public class ShaftlessCogInstance extends SingleRotatingInstance {
|
|||
InstancedTileRenderRegistry.instance.register(type, ShaftlessCogInstance::new));
|
||||
}
|
||||
|
||||
public ShaftlessCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) {
|
||||
public ShaftlessCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ public class MillStoneCogInstance extends SingleRotatingInstance {
|
|||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () ->
|
||||
InstancedTileRenderRegistry.instance.register(type, MillStoneCogInstance::new)); }
|
||||
|
||||
public MillStoneCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) {
|
||||
public MillStoneCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ public class SawInstance extends SingleRotatingInstance {
|
|||
InstancedTileRenderRegistry.instance.register(type, SawInstance::new));
|
||||
}
|
||||
|
||||
public SawInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) {
|
||||
public SawInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ public class PumpCogInstance extends SingleRotatingInstance {
|
|||
InstancedTileRenderRegistry.instance.register(type, PumpCogInstance::new));
|
||||
}
|
||||
|
||||
public PumpCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) {
|
||||
public PumpCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ public class SplitShaftInstance extends KineticTileInstance<SplitShaftTileEntity
|
|||
|
||||
protected ArrayList<InstanceKey<RotatingData>> keys;
|
||||
|
||||
public SplitShaftInstance(InstancedTileRenderer modelManager, SplitShaftTileEntity tile) {
|
||||
public SplitShaftInstance(InstancedTileRenderer<?> modelManager, SplitShaftTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ public class GearboxInstance extends KineticTileInstance<GearboxTileEntity> {
|
|||
protected EnumMap<Direction, InstanceKey<RotatingData>> keys;
|
||||
protected Direction sourceFacing;
|
||||
|
||||
public GearboxInstance(InstancedTileRenderer modelManager, GearboxTileEntity tile) {
|
||||
public GearboxInstance(InstancedTileRenderer<?> modelManager, GearboxTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ public class ArmInstance extends SingleRotatingInstance {
|
|||
InstancedTileRenderRegistry.instance.register(type, ArmInstance::new));
|
||||
}
|
||||
|
||||
public ArmInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) {
|
||||
public ArmInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
|
||||
super(modelManager, tile);
|
||||
}
|
||||
|
||||
|
|
|
@ -4,5 +4,5 @@ import net.minecraft.tileentity.TileEntity;
|
|||
|
||||
@FunctionalInterface
|
||||
public interface IRendererFactory<T extends TileEntity> {
|
||||
TileEntityInstance<? super T> create(InstancedTileRenderer manager, T te);
|
||||
TileEntityInstance<? super T> create(InstancedTileRenderer<?> manager, T te);
|
||||
}
|
||||
|
|
|
@ -69,8 +69,6 @@ public abstract class InstancedModel<D extends InstanceData> extends BufferedMod
|
|||
vao.delete();
|
||||
}
|
||||
|
||||
protected abstract D newInstance();
|
||||
|
||||
public synchronized void deleteInstance(InstanceKey<D> key) {
|
||||
verifyKey(key);
|
||||
|
||||
|
@ -97,6 +95,8 @@ public abstract class InstancedModel<D extends InstanceData> extends BufferedMod
|
|||
return key;
|
||||
}
|
||||
|
||||
protected abstract D newInstance();
|
||||
|
||||
protected void doRender() {
|
||||
vao.with(vao -> {
|
||||
renderSetup();
|
||||
|
|
Loading…
Reference in a new issue