Housekeeping.

This commit is contained in:
JozsefA 2021-03-08 02:27:56 -08:00
parent 8ce0f47f01
commit b31f4d09bd
9 changed files with 10 additions and 10 deletions

View file

@ -15,7 +15,7 @@ public class ShaftlessCogInstance extends SingleRotatingInstance {
InstancedTileRenderRegistry.instance.register(type, ShaftlessCogInstance::new)); InstancedTileRenderRegistry.instance.register(type, ShaftlessCogInstance::new));
} }
public ShaftlessCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) { public ShaftlessCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -17,7 +17,7 @@ public class MillStoneCogInstance extends SingleRotatingInstance {
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () ->
InstancedTileRenderRegistry.instance.register(type, MillStoneCogInstance::new)); } InstancedTileRenderRegistry.instance.register(type, MillStoneCogInstance::new)); }
public MillStoneCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) { public MillStoneCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -22,7 +22,7 @@ public class SawInstance extends SingleRotatingInstance {
InstancedTileRenderRegistry.instance.register(type, SawInstance::new)); InstancedTileRenderRegistry.instance.register(type, SawInstance::new));
} }
public SawInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) { public SawInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -18,7 +18,7 @@ public class PumpCogInstance extends SingleRotatingInstance {
InstancedTileRenderRegistry.instance.register(type, PumpCogInstance::new)); InstancedTileRenderRegistry.instance.register(type, PumpCogInstance::new));
} }
public PumpCogInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) { public PumpCogInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -26,7 +26,7 @@ public class SplitShaftInstance extends KineticTileInstance<SplitShaftTileEntity
protected ArrayList<InstanceKey<RotatingData>> keys; protected ArrayList<InstanceKey<RotatingData>> keys;
public SplitShaftInstance(InstancedTileRenderer modelManager, SplitShaftTileEntity tile) { public SplitShaftInstance(InstancedTileRenderer<?> modelManager, SplitShaftTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -29,7 +29,7 @@ public class GearboxInstance extends KineticTileInstance<GearboxTileEntity> {
protected EnumMap<Direction, InstanceKey<RotatingData>> keys; protected EnumMap<Direction, InstanceKey<RotatingData>> keys;
protected Direction sourceFacing; protected Direction sourceFacing;
public GearboxInstance(InstancedTileRenderer modelManager, GearboxTileEntity tile) { public GearboxInstance(InstancedTileRenderer<?> modelManager, GearboxTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -18,7 +18,7 @@ public class ArmInstance extends SingleRotatingInstance {
InstancedTileRenderRegistry.instance.register(type, ArmInstance::new)); InstancedTileRenderRegistry.instance.register(type, ArmInstance::new));
} }
public ArmInstance(InstancedTileRenderer modelManager, KineticTileEntity tile) { public ArmInstance(InstancedTileRenderer<?> modelManager, KineticTileEntity tile) {
super(modelManager, tile); super(modelManager, tile);
} }

View file

@ -4,5 +4,5 @@ import net.minecraft.tileentity.TileEntity;
@FunctionalInterface @FunctionalInterface
public interface IRendererFactory<T extends TileEntity> { public interface IRendererFactory<T extends TileEntity> {
TileEntityInstance<? super T> create(InstancedTileRenderer manager, T te); TileEntityInstance<? super T> create(InstancedTileRenderer<?> manager, T te);
} }

View file

@ -69,8 +69,6 @@ public abstract class InstancedModel<D extends InstanceData> extends BufferedMod
vao.delete(); vao.delete();
} }
protected abstract D newInstance();
public synchronized void deleteInstance(InstanceKey<D> key) { public synchronized void deleteInstance(InstanceKey<D> key) {
verifyKey(key); verifyKey(key);
@ -97,6 +95,8 @@ public abstract class InstancedModel<D extends InstanceData> extends BufferedMod
return key; return key;
} }
protected abstract D newInstance();
protected void doRender() { protected void doRender() {
vao.with(vao -> { vao.with(vao -> {
renderSetup(); renderSetup();