mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-31 17:47:56 +00:00
Code Issues Releases Wiki Activity

Use inner/nested classes to shield ModelResourceLocation from server.

Browse Source 
Just cleaner then the old apoach. Thanks @SquidDev for the suggestion.
This commit is contained in:
Toad-Dev
2021-12-17 16:01:21 -08:00
parent d9777a8d2f
commit 9f337c2d1c
3 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,11 @@ import javax.annotation.Nonnull;
public class TurtleCraftingTable extends AbstractTurtleUpgrade public class TurtleCraftingTable extends AbstractTurtleUpgrade
{ {
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
private ModelResourceLocation leftModel; private static class Models
@Environment( EnvType.CLIENT ) {
private ModelResourceLocation rightModel; private static final ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_left", "inventory" );
private static final ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_right", "inventory" );
}
public TurtleCraftingTable( ResourceLocation id, ItemStack stack ) public TurtleCraftingTable( ResourceLocation id, ItemStack stack )
{ {
@@ -42,17 +44,6 @@ 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 ? Models.leftModel : Models.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" );
}
} }
} }

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

@@ -61,16 +61,30 @@ public class TurtleModem extends AbstractTurtleUpgrade
} }
} }
@Environment( EnvType.CLIENT )
private class Models
{
private final ModelResourceLocation leftOffModel = advanced ?
new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_left", "inventory" ) :
new ModelResourceLocation( "computercraft:turtle_modem_normal_off_left", "inventory" );
private final ModelResourceLocation rightOffModel = advanced ?
new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_right", "inventory" ) :
new ModelResourceLocation( "computercraft:turtle_modem_normal_off_right", "inventory" );
private final ModelResourceLocation leftOnModel = advanced ?
new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_left", "inventory" ) :
new ModelResourceLocation( "computercraft:turtle_modem_normal_on_left", "inventory" );
private final ModelResourceLocation rightOnModel = advanced ?
new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_right", "inventory" ) :
new ModelResourceLocation( "computercraft:turtle_modem_normal_on_right", "inventory" );
}
private final boolean advanced; private final boolean advanced;
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
private ModelResourceLocation leftOffModel; private Models models;
@Environment( EnvType.CLIENT )
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 )
{ {
@@ -96,7 +110,7 @@ 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(); if( models == null ) models = new Models();
boolean active = false; boolean active = false;
if( turtle != null ) if( turtle != null )
@@ -106,32 +120,8 @@ public class TurtleModem extends AbstractTurtleUpgrade
} }
return side == TurtleSide.LEFT return side == TurtleSide.LEFT
? TransformedModel.of( active ? leftOnModel : leftOffModel ) ? TransformedModel.of( active ? models.leftOnModel : models.leftOffModel )
: TransformedModel.of( active ? rightOnModel : rightOffModel ); : TransformedModel.of( active ? models.rightOnModel : models.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

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

@@ -26,9 +26,11 @@ import javax.annotation.Nonnull;
public class TurtleSpeaker extends AbstractTurtleUpgrade public class TurtleSpeaker extends AbstractTurtleUpgrade
{ {
@Environment( EnvType.CLIENT ) @Environment( EnvType.CLIENT )
private ModelResourceLocation leftModel; private static class Models
@Environment( EnvType.CLIENT ) {
private ModelResourceLocation rightModel; private static ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_left", "inventory" );
private static ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_right", "inventory" );
}
private static class Peripheral extends UpgradeSpeakerPeripheral private static class Peripheral extends UpgradeSpeakerPeripheral
{ {
@@ -45,6 +47,7 @@ public class TurtleSpeaker extends AbstractTurtleUpgrade
return turtle.getLevel(); return turtle.getLevel();
} }
@Nonnull
@Override @Override
public Vec3 getPosition() public Vec3 getPosition()
{ {
@@ -75,18 +78,7 @@ 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 ? Models.leftModel : Models.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