Anvilcraft/ntx4core
2
1
Fork 1
Code Issues 6 Pull requests Packages Projects Releases Wiki Activity

chore: format code

Browse source
This commit is contained in:
LordMZTE 2023-10-28 13:32:56 +02:00
parent 38a37cd7a9
commit 4acbedbfca
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
11 changed files with 358 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/anvilcraft/ntx4core/cosmetics/ClientEventHandler.java
View file

@ -10,7 +10,6 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@EventBusSubscriber(modid = Ntx4Core.MODID, bus = Bus.MOD, value = { Dist.CLIENT })
public class ClientEventHandler {
@SubscribeEvent
public static void clientSetup(EntityRenderersEvent.AddLayers event) {
Ntx4Core.LOGGER.info("Client Setup: adding CosmeticLayer");
@ -20,8 +19,6 @@ public class ClientEventHandler {
Ntx4Core.LOGGER.info("Client Setup: added CosmeticLayer");
render.addFeature(new CosmeticFeatureRenderer(render, skin));
}
}
}
}

158
src/main/java/net/anvilcraft/ntx4core/cosmetics/CosmeticArmorRenderer.java
View file

@ -39,7 +39,6 @@ import java.util.*;
public class CosmeticArmorRenderer extends BipedEntityModel
implements IGeoRenderer<CosmeticItem>, ModelFetcher<CosmeticItem> {
protected CosmeticItem currentArmorItem;
protected LivingEntity entityLiving;
protected float widthScale = 1;
@ -60,34 +59,52 @@ public class CosmeticArmorRenderer extends BipedEntityModel
private IRenderCycle currentModelRenderCycle = EModelRenderCycle.INITIAL;
{
AnimationController.addModelFetcher(this);
}
{ AnimationController.addModelFetcher(this); }
@Override
@Nullable
public IAnimatableModel<CosmeticItem> apply(IAnimatable t) {
if (t instanceof CosmeticItem) return this.getGeoModelProvider();
if (t instanceof CosmeticItem)
return this.getGeoModelProvider();
return null;
}
public CosmeticArmorRenderer() {
super(MinecraftClient.getInstance().getEntityModelLoader().getModelPart(EntityModelLayers.PLAYER_INNER_ARMOR));
super(MinecraftClient.getInstance().getEntityModelLoader().getModelPart(
EntityModelLayers.PLAYER_INNER_ARMOR
));
this.modelProvider = new CosmeticModel();
}
@Override
public void render(MatrixStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay,
float red, float green, float blue, float alpha) {
public void render(
MatrixStack poseStack,
VertexConsumer buffer,
int packedLight,
int packedOverlay,
float red,
float green,
float blue,
float alpha
) {
this.render(0, poseStack, buffer, packedLight);
}
public void render(float partialTick, MatrixStack poseStack, VertexConsumer buffer, int packedLight) {
GeoModel model = this.modelProvider.getModel(this.modelProvider.getModelLocation(this.currentArmorItem));
AnimationEvent animationEvent = new AnimationEvent(this.currentArmorItem, 0, 0,
MinecraftClient.getInstance().getTickDelta(), false, // can also be getLastFrameDuration()
Arrays.asList(this.entityLiving));
public void render(
float partialTick, MatrixStack poseStack, VertexConsumer buffer, int packedLight
) {
GeoModel model = this.modelProvider.getModel(
this.modelProvider.getModelLocation(this.currentArmorItem)
);
AnimationEvent animationEvent = new AnimationEvent(
this.currentArmorItem,
0,
0,
MinecraftClient.getInstance().getTickDelta(),
false, // can also be getLastFrameDuration()
Arrays.asList(this.entityLiving)
);
poseStack.push();
poseStack.translate(0, 24 / 16F, 0);
@ -96,18 +113,41 @@ public class CosmeticArmorRenderer extends BipedEntityModel
//this.dispatchedMat = poseStack.last().pose().copy();
this.dispatchedMat = poseStack.peek().getPositionMatrix().copy();
this.modelProvider.setLivingAnimations(this.currentArmorItem, getInstanceId(this.currentArmorItem), animationEvent);
this.modelProvider.setLivingAnimations(
this.currentArmorItem, getInstanceId(this.currentArmorItem), animationEvent
);
setCurrentModelRenderCycle(EModelRenderCycle.INITIAL);
fitToBiped();
RenderSystem.setShaderTexture(0, getTextureLocation(this.currentArmorItem));
Color renderColor = getRenderColor(this.currentArmorItem, partialTick, poseStack, null, buffer, packedLight);
RenderLayer renderType = getRenderType(this.currentArmorItem, partialTick, poseStack, null, buffer, packedLight,
getTextureLocation(this.currentArmorItem));
Color renderColor = getRenderColor(
this.currentArmorItem, partialTick, poseStack, null, buffer, packedLight
);
RenderLayer renderType = getRenderType(
this.currentArmorItem,
partialTick,
poseStack,
null,
buffer,
packedLight,
getTextureLocation(this.currentArmorItem)
);
render(model, this.currentArmorItem, partialTick, renderType, poseStack, null, buffer, packedLight,
OverlayTexture.DEFAULT_UV, renderColor.getRed() / 255f, renderColor.getGreen() / 255f,
renderColor.getBlue() / 255f, renderColor.getAlpha() / 255f);
render(
model,
this.currentArmorItem,
partialTick,
renderType,
poseStack,
null,
buffer,
packedLight,
OverlayTexture.DEFAULT_UV,
renderColor.getRed() / 255f,
renderColor.getGreen() / 255f,
renderColor.getBlue() / 255f,
renderColor.getAlpha() / 255f
);
if (ModList.get().isLoaded("patchouli"))
PatchouliCompat.patchouliLoaded(poseStack);
@ -116,34 +156,68 @@ public class CosmeticArmorRenderer extends BipedEntityModel
}
@Override
public void renderEarly(CosmeticItem animatable, MatrixStack poseStack, float partialTick, VertexConsumerProvider bufferSource,
VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue,
float alpha) {
public void renderEarly(
CosmeticItem animatable,
MatrixStack poseStack,
float partialTick,
VertexConsumerProvider bufferSource,
VertexConsumer buffer,
int packedLight,
int packedOverlay,
float red,
float green,
float blue,
float alpha
) {
//this.renderEarlyMat = poseStack.last().pose().copy();
this.renderEarlyMat = poseStack.peek().getPositionMatrix().copy();
this.currentArmorItem = animatable;
IGeoRenderer.super.renderEarly(animatable, poseStack, partialTick, bufferSource, buffer,
packedLight, packedOverlay, red, green, blue, alpha);
IGeoRenderer.super.renderEarly(
animatable,
poseStack,
partialTick,
bufferSource,
buffer,
packedLight,
packedOverlay,
red,
green,
blue,
alpha
);
}
@Override
public void renderRecursively(GeoBone bone, MatrixStack poseStack, VertexConsumer buffer, int packedLight,
int packedOverlay, float red, float green, float blue, float alpha) {
public void renderRecursively(
GeoBone bone,
MatrixStack poseStack,
VertexConsumer buffer,
int packedLight,
int packedOverlay,
float red,
float green,
float blue,
float alpha
) {
if (bone.isTrackingXform()) {
//Matrix4f poseState = poseStack.last().pose();
Matrix4f poseState = poseStack.peek().getPositionMatrix();
Vec3d renderOffset = getRenderOffset(this.currentArmorItem, 1);
Matrix4f localMatrix = RenderUtils.invertAndMultiplyMatrices(poseState, this.dispatchedMat);
Matrix4f localMatrix
= RenderUtils.invertAndMultiplyMatrices(poseState, this.dispatchedMat);
bone.setModelSpaceXform(RenderUtils.invertAndMultiplyMatrices(poseState, this.renderEarlyMat));
bone.setModelSpaceXform(
RenderUtils.invertAndMultiplyMatrices(poseState, this.renderEarlyMat)
);
//localMatrix.translate(new Vec3f(renderOffset));
localMatrix.addToLastColumn(new Vec3f(renderOffset));
bone.setLocalSpaceXform(localMatrix);
}
IGeoRenderer.super.renderRecursively(bone, poseStack, buffer, packedLight, packedOverlay, red, green, blue,
alpha);
IGeoRenderer.super.renderRecursively(
bone, poseStack, buffer, packedLight, packedOverlay, red, green, blue, alpha
);
}
public Vec3d getRenderOffset(CosmeticItem entity, float partialTick) {
@ -273,11 +347,18 @@ public class CosmeticArmorRenderer extends BipedEntityModel
this.setBoneVisibility(this.headBone, getCurrentCosmetic().getHead() != null);
this.setBoneVisibility(this.bodyBone, getCurrentCosmetic().getBody() != null);
this.setBoneVisibility(this.leftArmBone, getCurrentCosmetic().getLeftArm() != null);
this.setBoneVisibility(this.rightArmBone, getCurrentCosmetic().getRightArm() != null);
this.setBoneVisibility(this.leftLegBone, getCurrentCosmetic().getLeftLeg() != null);
this.setBoneVisibility(this.rightLegBone, getCurrentCosmetic().getRightLeg() != null);
this.setBoneVisibility(
this.leftArmBone, getCurrentCosmetic().getLeftArm() != null
);
this.setBoneVisibility(
this.rightArmBone, getCurrentCosmetic().getRightArm() != null
);
this.setBoneVisibility(
this.leftLegBone, getCurrentCosmetic().getLeftLeg() != null
);
this.setBoneVisibility(
this.rightLegBone, getCurrentCosmetic().getRightLeg() != null
);
}
/**
@ -313,7 +394,9 @@ public class CosmeticArmorRenderer extends BipedEntityModel
@Override
public int getInstanceId(CosmeticItem animatable) {
return Objects.hash(this.currentArmorItem.getCosmetic().getID(), this.entityLiving.getUuid());
return Objects.hash(
this.currentArmorItem.getCosmetic().getID(), this.entityLiving.getUuid()
);
}
@Override
@ -330,4 +413,3 @@ public class CosmeticArmorRenderer extends BipedEntityModel
return this.currentArmorItem.getCosmetic();
}
}

45
src/main/java/net/anvilcraft/ntx4core/cosmetics/CosmeticFeatureRenderer.java
View file

@ -15,8 +15,10 @@ import net.minecraft.client.render.entity.model.PlayerEntityModel;
import net.minecraft.client.render.item.ItemRenderer;
import net.minecraft.client.util.math.MatrixStack;
public class CosmeticFeatureRenderer extends ArmorFeatureRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>, BipedEntityModel<AbstractClientPlayerEntity>> {
public class CosmeticFeatureRenderer extends ArmorFeatureRenderer<
AbstractClientPlayerEntity,
PlayerEntityModel<AbstractClientPlayerEntity>,
BipedEntityModel<AbstractClientPlayerEntity>> {
private static final Map<ICosmetic, CosmeticItem> modelCache = new HashMap<>();
private static CosmeticArmorRenderer cosmeticRenderer = null;
PlayerEntityRenderer renderer;
@ -29,22 +31,48 @@ public class CosmeticFeatureRenderer extends ArmorFeatureRenderer<AbstractClient
}
@Override
public void render(MatrixStack matrix, VertexConsumerProvider buffer, int light, AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
public void render(
MatrixStack matrix,
VertexConsumerProvider buffer,
int light,
AbstractClientPlayerEntity player,
float limbSwing,
float limbSwingAmount,
float partialTicks,
float ageInTicks,
float netHeadYaw,
float headPitch
) {
for (ICosmetic c : CosmeticsManager.getCosmeticsForPlayer(player.getUuid())) {
if (c.readyToRender()) this.renderCosmetic(matrix, buffer, player, light, c, partialTicks);
if (c.readyToRender())
this.renderCosmetic(matrix, buffer, player, light, c, partialTicks);
}
}
private void renderCosmetic(MatrixStack matrix, VertexConsumerProvider buffer, AbstractClientPlayerEntity player, int light, ICosmetic cosmetic, float partialTicks) {
if (cosmeticRenderer == null) cosmeticRenderer = new CosmeticArmorRenderer();
if (!modelCache.containsKey(cosmetic)) modelCache.put(cosmetic, new CosmeticItem(cosmetic));
private void renderCosmetic(
MatrixStack matrix,
VertexConsumerProvider buffer,
AbstractClientPlayerEntity player,
int light,
ICosmetic cosmetic,
float partialTicks
) {
if (cosmeticRenderer == null)
cosmeticRenderer = new CosmeticArmorRenderer();
if (!modelCache.containsKey(cosmetic))
modelCache.put(cosmetic, new CosmeticItem(cosmetic));
CosmeticItem item = modelCache.get(cosmetic);
copyRotations(this.renderer.getModel(), cosmeticRenderer);
cosmeticRenderer.applyEntityStats(this.renderer.getModel());
cosmeticRenderer.setCurrentItem(player, item);
cosmeticRenderer.filterBones();
VertexConsumer vertex = ItemRenderer.getArmorGlintConsumer(buffer, RenderLayer.getArmorCutoutNoCull(cosmetic.getTextureLocation()), false, false);
VertexConsumer vertex = ItemRenderer.getArmorGlintConsumer(
buffer,
RenderLayer.getArmorCutoutNoCull(cosmetic.getTextureLocation()),
false,
false
);
cosmeticRenderer.render(partialTicks, matrix, vertex, light);
}
@ -61,5 +89,4 @@ public class CosmeticFeatureRenderer extends ArmorFeatureRenderer<AbstractClient
private static void copyRotations(ModelPart from, ModelPart to) {
to.copyTransform(from);
}
}

6
src/main/java/net/anvilcraft/ntx4core/cosmetics/CosmeticItem.java
View file

@ -10,7 +10,6 @@ import software.bernie.geckolib3.core.manager.AnimationFactory;
import software.bernie.geckolib3.util.GeckoLibUtil;
public class CosmeticItem implements IAnimatable {
private ICosmetic cosmetic = null;
private AnimationBuilder animationBuilder = new AnimationBuilder();
@ -27,7 +26,9 @@ public class CosmeticItem implements IAnimatable {
@Override
public void registerControllers(AnimationData data) {
data.addAnimationController(new AnimationController<>(this, "controller", 20, this::predicate));
data.addAnimationController(
new AnimationController<>(this, "controller", 20, this::predicate)
);
}
private final AnimationFactory factory = GeckoLibUtil.createFactory(this);
@ -40,5 +41,4 @@ public class CosmeticItem implements IAnimatable {
public ICosmetic getCosmetic() {
return this.cosmetic;
}
}

3
src/main/java/net/anvilcraft/ntx4core/cosmetics/CosmeticModel.java
View file

@ -4,7 +4,6 @@ import net.minecraft.util.Identifier;
import software.bernie.geckolib3.model.AnimatedGeoModel;
public class CosmeticModel extends AnimatedGeoModel<CosmeticItem> {
@Override
public Identifier getAnimationFileLocation(CosmeticItem animatable) {
return animatable.getCosmetic().getAnimationFileLocation();
@ -19,6 +18,4 @@ public class CosmeticModel extends AnimatedGeoModel<CosmeticItem> {
public Identifier getTextureLocation(CosmeticItem animatable) {
return animatable.getCosmetic().getTextureLocation();
}
}

8
src/main/java/net/anvilcraft/ntx4core/cosmetics/CosmeticsManager.java
View file

@ -9,7 +9,6 @@ import java.util.Set;
import java.util.UUID;
public class CosmeticsManager {
private static List<ICosmeticProvider> providers = new ArrayList<>();
private static Map<UUID, List<ICosmetic>> cosmeticCache = new HashMap<>();
private static Set<UUID> activePlayers = new HashSet<>();
@ -19,7 +18,8 @@ public class CosmeticsManager {
for (ICosmeticProvider provider : providers) {
doRefresh = doRefresh || provider.requestsRefresh();
}
if (!doRefresh) return;
if (!doRefresh)
return;
cosmeticCache.clear();
for (UUID uuid : activePlayers) {
loadPlayer(uuid);
@ -27,7 +27,8 @@ public class CosmeticsManager {
}
private static void loadPlayer(UUID player) {
if (cosmeticCache.containsKey(player)) return;
if (cosmeticCache.containsKey(player))
return;
cosmeticCache.put(player, new ArrayList<>());
List<ICosmetic> cosmetics = cosmeticCache.get(player);
for (ICosmeticProvider provider : providers) {
@ -47,5 +48,4 @@ public class CosmeticsManager {
refresh();
return cosmeticCache.get(uuid);
}
}

2
src/main/java/net/anvilcraft/ntx4core/cosmetics/ICosmetic.java
View file

@ -4,7 +4,6 @@ import net.minecraft.util.Identifier;
import software.bernie.geckolib3.core.builder.AnimationBuilder;
public interface ICosmetic {
Identifier getAnimationFileLocation();
Identifier getModelLocation();
@ -42,5 +41,4 @@ public interface ICosmetic {
}
Identifier getID();
}

2
src/main/java/net/anvilcraft/ntx4core/cosmetics/ICosmeticProvider.java
View file

@ -4,9 +4,7 @@ import java.util.UUID;
import java.util.function.Consumer;
public interface ICosmeticProvider {
boolean requestsRefresh();
void addCosmetics(UUID player, Consumer<ICosmetic> cosmeticAdder);
}

4
src/main/java/net/anvilcraft/ntx4core/recipe/RecipeContainsPredicate.java
View file

@ -16,7 +16,7 @@ public class RecipeContainsPredicate implements Predicate<Recipe<?>> {
public boolean test(Recipe<?> r) {
return r.getIngredients() == null
? false
: r.getIngredients().stream().anyMatch(new StackIngredientCondition(this.item))
|| r.getOutput().isItemEqual(this.item);
: r.getIngredients().stream().anyMatch(new StackIngredientCondition(this.item)
) || r.getOutput().isItemEqual(this.item);
}
}

6
src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java
View file

@ -28,14 +28,12 @@ public class InputReplacements {
ev.mapRecipeID(
new Identifier("projecte", "relay_mk1"),
new InputReplaceRecipeMapper().replace(
"#forge:storage_blocks/diamond",
"mekanism:pellet_antimatter"
"#forge:storage_blocks/diamond", "mekanism:pellet_antimatter"
)
);
var philosopherStoneMapper = new InputReplaceRecipeMapper().replace(
"#forge:gems/diamond",
"#ntx4core:darkmatter"
"#forge:gems/diamond", "#ntx4core:darkmatter"
);
ev.mapRecipeID(
new Identifier("projecte", "philosophers_stone"), philosopherStoneMapper

1
src/main/java/net/anvilcraft/ntx4core/recipes/ShapedRecipes.java
View file

@ -27,6 +27,5 @@ public class ShapedRecipes {
.ingredient('C', "mekanism:teleportation_core")
.ingredient('E', "mekanism:energy_tablet")
.build());
}
}