mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-28 08:12:18 +00:00
Code Issues Releases Wiki Activity

Don't use ModelResourceLocation class on dedicated server.

Browse Source 
Missed this during the merge.
This commit is contained in:
Toad-Dev 2021-12-15 15:56:46 -08:00
parent a549400776
commit ad0080ef32
3 changed files with 64 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java
View File

@ -21,8 +21,10 @@ import javax.annotation.Nonnull;
public class TurtleCraftingTable extends AbstractTurtleUpgrade public class TurtleCraftingTable extends AbstractTurtleUpgrade
{ {
private static final ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_left", "inventory" ); @Environment( EnvType.CLIENT )
private static final ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_right", "inventory" ); private ModelResourceLocation leftModel;
@Environment( EnvType.CLIENT )
private ModelResourceLocation rightModel;
public TurtleCraftingTable( ResourceLocation id, ItemStack stack ) public TurtleCraftingTable( ResourceLocation id, ItemStack stack )
{ {
@ -40,6 +42,17 @@ public class TurtleCraftingTable extends AbstractTurtleUpgrade
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{ {
loadModelLocations();
return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel ); return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel );
} }
@Environment( EnvType.CLIENT )
private void loadModelLocations()
{
if( leftModel == null )
{
leftModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_left", "inventory" );
rightModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_right", "inventory" );
}
}
} }

53
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java
View File

@ -63,30 +63,19 @@ public class TurtleModem extends AbstractTurtleUpgrade
private final boolean advanced; private final boolean advanced;
private final ModelResourceLocation leftOffModel; @Environment( EnvType.CLIENT )
private final ModelResourceLocation rightOffModel; private ModelResourceLocation leftOffModel;
private final ModelResourceLocation leftOnModel; @Environment( EnvType.CLIENT )
private final ModelResourceLocation rightOnModel; private ModelResourceLocation rightOffModel;
@Environment( EnvType.CLIENT )
private ModelResourceLocation leftOnModel;
@Environment( EnvType.CLIENT )
private ModelResourceLocation rightOnModel;
public TurtleModem( ResourceLocation id, ItemStack stack, boolean advanced ) public TurtleModem( ResourceLocation id, ItemStack stack, boolean advanced )
{ {
super( id, TurtleUpgradeType.PERIPHERAL, advanced ? WirelessModemPeripheral.ADVANCED_ADJECTIVE : WirelessModemPeripheral.NORMAL_ADJECTIVE, stack ); super( id, TurtleUpgradeType.PERIPHERAL, advanced ? WirelessModemPeripheral.ADVANCED_ADJECTIVE : WirelessModemPeripheral.NORMAL_ADJECTIVE, stack );
this.advanced = advanced; this.advanced = advanced;
if( advanced )
{
leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_left", "inventory" );
rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_right", "inventory" );
leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_left", "inventory" );
rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_right", "inventory" );
}
else
{
leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_left", "inventory" );
rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_right", "inventory" );
leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_left", "inventory" );
rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_right", "inventory" );
}
} }
@Override @Override
@ -107,6 +96,8 @@ public class TurtleModem extends AbstractTurtleUpgrade
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{ {
loadModelLocations();
boolean active = false; boolean active = false;
if( turtle != null ) if( turtle != null )
{ {
@ -119,6 +110,30 @@ public class TurtleModem extends AbstractTurtleUpgrade
: TransformedModel.of( active ? rightOnModel : rightOffModel ); : TransformedModel.of( active ? rightOnModel : rightOffModel );
} }
// This exists separate from the constructor because we can't use the class ModelResourceLocation on the dedicated
// server.
@Environment( EnvType.CLIENT )
private void loadModelLocations()
{
if( leftOffModel == null )
{
if( advanced )
{
leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_left", "inventory" );
rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_right", "inventory" );
leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_left", "inventory" );
rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_right", "inventory" );
}
else
{
leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_left", "inventory" );
rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_right", "inventory" );
leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_left", "inventory" );
rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_right", "inventory" );
}
}
}
@Override @Override
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side ) public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
{ {

17
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
View File

@ -25,8 +25,10 @@ import javax.annotation.Nonnull;
public class TurtleSpeaker extends AbstractTurtleUpgrade public class TurtleSpeaker extends AbstractTurtleUpgrade
{ {
private static final ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_left", "inventory" ); @Environment( EnvType.CLIENT )
private static final ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_right", "inventory" ); private ModelResourceLocation leftModel;
@Environment( EnvType.CLIENT )
private ModelResourceLocation rightModel;
private static class Peripheral extends UpgradeSpeakerPeripheral private static class Peripheral extends UpgradeSpeakerPeripheral
{ {
@ -73,9 +75,20 @@ public class TurtleSpeaker extends AbstractTurtleUpgrade
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{ {
loadModelLocations();
return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel ); return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel );
} }
@Environment( EnvType.CLIENT )
private void loadModelLocations()
{
if( leftModel == null )
{
leftModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_left", "inventory" );
rightModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_right", "inventory" );
}
}
@Override @Override
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide turtleSide ) public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide turtleSide )
{ {