fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start of part registration.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-08 21:27:22 +02:00
parent b2afa0398c
commit 4b11b8857b
23 changed files with 220 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+5 -4
View File
@@ -65,9 +65,6 @@ public class CableBusBakedModel implements IBakedModel
private final TextureAtlasSprite particleTexture;
private final AtlasTexture textureMap = Minecraft.getInstance().getModelManager().getAtlasTexture( AtlasTexture.LOCATION_BLOCKS_TEXTURE );
private final TextureAtlasSprite missingTexture = textureMap.getSprite( MissingTextureSprite.getLocation() );
CableBusBakedModel( CableBuilder cableBuilder, FacadeBuilder facadeBuilder, Map<ResourceLocation, IBakedModel> partModels, TextureAtlasSprite particleTexture )
{
this.cableBuilder = cableBuilder;
@@ -317,7 +314,7 @@ public class CableBusBakedModel implements IBakedModel
// If a part sub-model has no particle texture (indicated by it being the missing texture),
// don't add it, so we don't get ugly missing texture break particles.
if( this.missingTexture != particleTexture )
if( isMissingTexture(particleTexture) )
{
result.add( particleTexture );
}
@@ -327,6 +324,10 @@ public class CableBusBakedModel implements IBakedModel
return result;
}
private boolean isMissingTexture(TextureAtlasSprite particleTexture) {
return particleTexture instanceof MissingTextureSprite;
}
@Override
public boolean isAmbientOcclusion()
{
src/main/java/appeng/client/render/cablebus/CableBusModel.java
+14 -27
View File
@@ -24,27 +24,24 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.Material;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import appeng.api.util.AEColor;
import appeng.core.features.registries.PartModels;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
/**
* The built-in model for the cable bus block.
*/
public class CableBusModel implements IUnbakedModel
public class CableBusModel implements IModelGeometry<CableBusModel>
{
private final PartModels partModels;
@@ -55,25 +52,10 @@ public class CableBusModel implements IUnbakedModel
}
@Override
public Collection<ResourceLocation> getDependencies()
{
this.partModels.setInitialized( true );
return this.partModels.getModels();
}
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) {
Map<ResourceLocation, IBakedModel> partModels = this.loadPartModels( bakery, spriteGetter, modelTransform );
@Override
public Collection<Material> getTextures( Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
{
return Collections.unmodifiableList( CableBuilder.getTextures() );
}
@Nullable
@Override
public IBakedModel bakeModel( ModelBakery modelBakeryIn, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn, ResourceLocation locationIn )
{
Map<ResourceLocation, IBakedModel> partModels = this.loadPartModels( modelBakeryIn, spriteGetterIn, transformIn );
CableBuilder cableBuilder = new CableBuilder( spriteGetterIn );
CableBuilder cableBuilder = new CableBuilder( spriteGetter );
FacadeBuilder facadeBuilder = new FacadeBuilder();
// This should normally not be used, but we *have* to provide a particle texture or otherwise damage models will
@@ -83,13 +65,18 @@ public class CableBusModel implements IUnbakedModel
return new CableBusBakedModel( cableBuilder, facadeBuilder, partModels, particleTexture );
}
private Map<ResourceLocation, IBakedModel> loadPartModels( ModelBakery modelBakeryIn, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn )
@Override
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
return Collections.unmodifiableList( CableBuilder.getTextures() );
}
private Map<ResourceLocation, IBakedModel> loadPartModels( ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn )
{
ImmutableMap.Builder<ResourceLocation, IBakedModel> result = ImmutableMap.builder();
for( ResourceLocation location : this.partModels.getModels() )
{
result.put( location, modelBakeryIn.getBakedModel( location, transformIn, spriteGetterIn ) );
result.put( location, bakery.getBakedModel( location, transformIn, spriteGetterIn ) );
}
return result.build();