Skip to content

Commit b8521b3

Browse files
SygikalSygikal
committed
clean up imports
1 parent dd28ff3 commit b8521b3

4 files changed

Lines changed: 0 additions & 100 deletions

File tree

‎src/main/java/dev/sygii/variantapi/VariantAPI.java‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,12 @@ public void onInitialize() {
101101
conditionFeatures.put(CustomWoolFeature.ID, data -> new CustomWoolFeature(Identifier.tryParse(data.get("texture").getAsString())));
102102
conditionFeatures.put(CustomShearedWoolFeature.ID, data -> new CustomShearedWoolFeature(Identifier.tryParse(data.get("texture").getAsString())));
103103

104-
105104
featureDeserializers.put(CustomEyesFeature.ID, CustomEyesFeature::deserialize);
106105
featureDeserializers.put(CustomLightingFeature.ID, CustomLightingFeature::deserialize);
107106
featureDeserializers.put(CustomRenderLayerFeature.ID, CustomRenderLayerFeature::deserialize);
108107
featureDeserializers.put(CustomWoolFeature.ID, CustomWoolFeature::deserialize);
109108
featureDeserializers.put(CustomShearedWoolFeature.ID, CustomShearedWoolFeature::deserialize);
110109

111-
112-
113-
114110
/*ServerLifecycleEvents.SYNC_DATA_PACK_CONTENTS.register(VariantAPI.id("sync_variants"), (player, joined) -> {
115111
ServerPlayNetworking.send(player, new S2CResetVariants());
116112
VariantAPI.variantPacketQueue.forEach((packet) -> ServerPlayNetworking.send(player, packet));
@@ -169,10 +165,6 @@ public static ArrayList<Variant> getSuitable(ArrayList<Variant> variantsToChoose
169165
sorted.add(variant);
170166
}
171167

172-
// Split the random to ensure no off-thread access of ThreadLocalRandom occurs
173-
// This fixes issues with Distant Horizons and C2ME
174-
//var random = new CheckedRandom(randomSeed);
175-
// Handle modifiers
176168
Iterator<Variant> i = sorted.iterator();
177169
Variant variant;
178170
while (i.hasNext()) {
@@ -184,59 +176,7 @@ public static ArrayList<Variant> getSuitable(ArrayList<Variant> variantsToChoose
184176
continue;
185177
}
186178
}
187-
188-
// Discard if not in spawn biome
189-
/*if (spawnBiome != null && variant.hasSpawnableBiomeModifier()) {
190-
if (!variant.isInSpawnBiome(spawnBiome)) {
191-
i.remove();
192-
continue;
193-
}
194-
}*/
195-
196-
// Discard if special breeding result (handled later)
197-
/*if (variant.hasBreedingResultModifier()) {
198-
i.remove();
199-
continue;
200-
}*/
201-
202-
// Discard if variant is discardable
203-
/*if (variant.shouldDiscard(random)) {
204-
i.remove();
205-
continue;
206-
}*/
207-
208-
// Discord if variant has nametag override
209-
// Note: they shouldn't be in this pool in the first place, but better safe than sorry
210-
/*if (variant.isNametagOverride()) {
211-
i.remove();
212-
continue;
213-
}*/
214179
}
215-
216-
// Create weighted bag from variants
217-
//VariantBag bag = new VariantBag(mob, variants);
218-
219-
// If we've been provided 2 parents
220-
/*if (breedingResultData != null) {
221-
// Collect all specialized breeding combination results
222-
List<MobVariant> possibleVariants = new ArrayList<>();
223-
for (MobVariant v : getVariants(mob)) {
224-
if (v.hasBreedingResultModifier() && v.canBreed(breedingResultData.parent1(), breedingResultData.parent2()) && v.shouldBreed(random)) {
225-
possibleVariants.add(v);
226-
}
227-
}
228-
229-
// If there are no specialized results, handle generic breeding case
230-
if (possibleVariants.isEmpty()) {
231-
if (random.nextDouble() >= VariantSettings.getChildRandomVariantChance()) {
232-
return random.nextBoolean() ? breedingResultData.parent1() : breedingResultData.parent2();
233-
}
234-
} else { // If there are specialized results, switch to that pool
235-
bag = new VariantBag(mob, possibleVariants);
236-
}
237-
}*/
238-
239-
//return bag.getRandomEntry(random);
240180
//testLootCondition(context.getSource(), IdentifierArgumentType.getPredicateArgument(context, "predicate"))
241181
return sorted;
242182
}

‎src/main/java/dev/sygii/variantapi/VariantAPIClient.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
11
package dev.sygii.variantapi;
22

3-
import dev.sygii.variantapi.features.ShearedSheepWoolColorFeatureRenderer;
43
import dev.sygii.variantapi.network.ClientPacketHandler;
54
import dev.sygii.variantapi.network.packet.C2SRequestVariantPacket;
65
import dev.sygii.variantapi.variants.Variant;
76
import net.fabricmc.api.ClientModInitializer;
8-
import net.fabricmc.api.ModInitializer;
97
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
108
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
11-
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback;
12-
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
13-
import net.minecraft.client.render.entity.SheepEntityRenderer;
14-
import net.minecraft.client.render.entity.feature.FeatureRendererContext;
15-
import net.minecraft.entity.Entity;
169
import net.minecraft.entity.EntityType;
17-
import net.minecraft.entity.mob.SkeletonEntity;
18-
import net.minecraft.nbt.NbtCompound;
19-
import net.minecraft.nbt.NbtList;
20-
import net.minecraft.nbt.NbtString;
21-
import net.minecraft.network.PacketByteBuf;
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
2410

2511
import java.util.ArrayList;
2612
import java.util.HashMap;
27-
import java.util.List;
2813
import java.util.Map;
2914

3015
public class VariantAPIClient implements ClientModInitializer {

‎src/main/java/dev/sygii/variantapi/features/VariantOverlayFeatureRenderer.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,5 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
5454
}
5555
}
5656
}*/
57-
/*NbtCompound nbt = new NbtCompound();
58-
entity.writeCustomDataToNbt(nbt);
59-
60-
if (nbt.contains(MoreMobVariants.MUDDY_NBT_KEY)) {
61-
if (nbt.getBoolean(MoreMobVariants.MUDDY_NBT_KEY)) {
62-
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(this.getMudTexture());
63-
((Model)this.getContextModel()).render(matrices, vertexConsumer, 0xF00000, OverlayTexture.DEFAULT_UV, 1.0f, 1.0f, 1.0f, 1.0f);
64-
}
65-
}*/
6657
}
6758
}

‎src/main/java/dev/sygii/variantapi/mixin/entity/LivingEntityRendererMixin.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package dev.sygii.variantapi.mixin.entity;
22

3-
import com.llamalad7.mixinextras.sugar.Local;
43
import dev.sygii.variantapi.VariantAPI;
54
import dev.sygii.variantapi.acess.EntityAccess;
65
import dev.sygii.variantapi.variants.Variant;
7-
import dev.sygii.variantapi.variants.feature.CustomEyesFeature;
86
import dev.sygii.variantapi.variants.feature.CustomLightingFeature;
97
import dev.sygii.variantapi.variants.feature.CustomRenderLayerFeature;
108
import dev.sygii.variantapi.variants.feature.CustomShearedWoolFeature;
11-
import net.minecraft.client.model.Model;
12-
import net.minecraft.client.render.OverlayTexture;
139
import net.minecraft.client.render.RenderLayer;
1410
import net.minecraft.client.render.VertexConsumer;
1511
import net.minecraft.client.render.VertexConsumerProvider;
@@ -27,7 +23,6 @@
2723
import org.spongepowered.asm.mixin.injection.Inject;
2824
import org.spongepowered.asm.mixin.injection.Redirect;
2925
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
30-
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
3126

3227
@Debug(export=true)
3328
@Mixin(LivingEntityRenderer.class)
@@ -42,15 +37,6 @@ private Identifier init(LivingEntityRenderer instance, Entity entity) {
4237
if (!variant.id().equals(VariantAPI.getDefaultVariant().id())) {
4338
return variant.texture();
4439
}
45-
46-
/*if (skeletonEntity.hasCustomName()) {
47-
MobVariant variant = Variants.getVariantFromNametag(EntityType.SKELETON, skeletonEntity.getName().getString());
48-
if (variant != null) {
49-
Identifier identifier = variant.getIdentifier();
50-
ci.setReturnValue(Identifier.of(identifier.getNamespace(), "textures/entity/skeleton/" + identifier.getPath() + ".png"));
51-
}
52-
}
53-
return DEFAULT;*/
5440
return instance.getTexture(entity);
5541
}
5642

@@ -82,8 +68,6 @@ private void renderVariantOverlays(T livingEntity, float f, float g, MatrixStack
8268
light = ((CustomLightingFeature)k.getFeature(CustomLightingFeature.ID)).getLight();
8369
}
8470
this.model.render(matrixStack, vertexConsumer, light, ((LivingEntityRenderer)(Object)this).getOverlay(livingEntity, ((LivingEntityRenderer)(Object)this).getAnimationCounter(livingEntity, g)), 1.0F, 1.0F, 1.0F, 1.0F);
85-
86-
//((Model) this.getContextModel()).render(matrices, vertexConsumer, 0xF00000, OverlayTexture.DEFAULT_UV, 1.0f, 1.0f, 1.0f, 1.0f);
8771
});
8872
}
8973
}

0 commit comments

Comments
 (0)