fix instances & update flywheel

This commit is contained in:
IThundxr 2024-07-19 17:05:19 -04:00 committed by Jozufozu
parent 05c2cbaf73
commit 73661845fe
5 changed files with 6 additions and 16 deletions

View file

@ -23,7 +23,7 @@ use_parchment = true
# dependency versions # dependency versions
registrate_version = MC1.20-1.3.3 registrate_version = MC1.20-1.3.3
flywheel_minecraft_version = 1.20.1 flywheel_minecraft_version = 1.20.1
flywheel_version = 1.0.0-beta-97 flywheel_version = 1.0.0-beta-98
jei_minecraft_version = 1.20.1 jei_minecraft_version = 1.20.1
jei_version = 15.2.0.22 jei_version = 15.2.0.22
curios_minecraft_version = 1.20.1 curios_minecraft_version = 1.20.1

View file

@ -42,13 +42,8 @@ public class FluidValveVisual extends ShaftVisual<FluidValveBlockEntity> impleme
settled = false; settled = false;
pointer = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.FLUID_VALVE_POINTER)).createInstance(); pointer = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.FLUID_VALVE_POINTER)).createInstance();
}
@Override transformPointer(partialTick);
public void init(float pt) {
super.init(pt);
transformPointer(pt);
} }
@Override @Override

View file

@ -15,9 +15,6 @@ public class SingleRotatingVisual<T extends KineticBlockEntity> extends KineticB
public SingleRotatingVisual(VisualizationContext context, T blockEntity, float partialTick) { public SingleRotatingVisual(VisualizationContext context, T blockEntity, float partialTick) {
super(context, blockEntity, partialTick); super(context, blockEntity, partialTick);
}
public void init(float pt) {
rotatingModel = instancerProvider.instancer(AllInstanceTypes.ROTATING, model()) rotatingModel = instancerProvider.instancer(AllInstanceTypes.ROTATING, model())
.createInstance(); .createInstance();
setup(rotatingModel); setup(rotatingModel);

View file

@ -31,11 +31,10 @@ public abstract class GaugeVisual extends ShaftVisual<GaugeBlockEntity> implemen
protected GaugeVisual(VisualizationContext context, GaugeBlockEntity blockEntity, float partialTick) { protected GaugeVisual(VisualizationContext context, GaugeBlockEntity blockEntity, float partialTick) {
super(context, blockEntity, partialTick); super(context, blockEntity, partialTick);
init();
init(partialTick);
} }
public void init(float partialTick) { public void init() {
GaugeBlock gaugeBlock = (GaugeBlock) blockState.getBlock(); GaugeBlock gaugeBlock = (GaugeBlock) blockState.getBlock();
Instancer<TransformedInstance> dialModel = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.GAUGE_DIAL)); Instancer<TransformedInstance> dialModel = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.GAUGE_DIAL));

View file

@ -26,11 +26,10 @@ public class BracketedKineticBlockEntityVisual extends SingleRotatingVisual<Brac
public BracketedKineticBlockEntityVisual(VisualizationContext context, BracketedKineticBlockEntity blockEntity, float partialTick) { public BracketedKineticBlockEntityVisual(VisualizationContext context, BracketedKineticBlockEntity blockEntity, float partialTick) {
super(context, blockEntity, partialTick); super(context, blockEntity, partialTick);
init();
init(partialTick);
} }
public void init(float partialTick) { public void init() {
if (ICogWheel.isLargeCog(blockEntity.getBlockState())) { if (ICogWheel.isLargeCog(blockEntity.getBlockState())) {
// Large cogs sometimes have to offset their teeth by 11.25 degrees in order to // Large cogs sometimes have to offset their teeth by 11.25 degrees in order to
// mesh properly // mesh properly