Skip to content

Commit cffc08c

Browse files
committed
Major cosmetics overhaul
1 parent db045eb commit cffc08c

71 files changed

Lines changed: 1075 additions & 3904 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

JexChangelog.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
0.8.3
2+
Added more cosmetics available through the Jex website, including new Hats, customizable Ears, Peg-Legs, an Appendage, and the Dinnerbone upside-down effect
3+
Added Swim mode to Jesus
4+
Added ability to use Nuker in survival
5+
Added translucency to capes
6+
Fixed CustomMainMenu no longer displaying custom capes properly
7+
Fixed EnchantColor not allowing customization after changing texture packs
8+
19
0.8.2
210
Added Nuker mod
311
Fixed JexGUI sometimes opening the pause menu when closing the menu

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ loader_version=0.14.6
99
fabric_version=0.55.1+1.19
1010

1111
# Mod Properties
12-
mod_version=0.8.2
12+
mod_version=0.8.3
1313
maven_group=me.dustin
1414
archives_base_name=jex-client

src/main/java/me/dustin/jex/JexClient.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
import me.dustin.jex.feature.plugin.JexPlugin;
2323
import me.dustin.jex.gui.changelog.changelog.JexChangelog;
2424
import me.dustin.jex.gui.waypoints.WaypointScreen;
25+
import me.dustin.jex.helper.addon.ears.EarsHelper;
26+
import me.dustin.jex.helper.addon.hat.HatHelper;
27+
import me.dustin.jex.helper.addon.pegleg.PeglegHelper;
28+
import me.dustin.jex.helper.addon.penis.PenisHelper;
2529
import me.dustin.jex.helper.file.FileHelper;
2630
import me.dustin.jex.helper.file.JsonHelper;
2731
import me.dustin.jex.helper.file.ModFileHelper;
@@ -104,6 +108,10 @@ public void initializeClient() {
104108
EventManager.register(ConnectedServerHelper.INSTANCE);
105109
EventManager.register(AddonHelper.INSTANCE);
106110
EventManager.register(CapeHelper.INSTANCE);
111+
EventManager.register(EarsHelper.INSTANCE);
112+
EventManager.register(HatHelper.INSTANCE);
113+
EventManager.register(PenisHelper.INSTANCE);
114+
EventManager.register(PeglegHelper.INSTANCE);
107115
getLogger().info("Checking for update");
108116
UpdateManager.INSTANCE.checkForUpdate();
109117
CustomFont.INSTANCE.loadFont();
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
import net.minecraft.client.model.ModelPart;
5+
6+
public class EventInitPlayerModel extends Event {
7+
private final ModelPart root;
8+
9+
public EventInitPlayerModel(ModelPart root) {
10+
this.root = root;
11+
}
12+
13+
public ModelPart getRoot() {
14+
return root;
15+
}
16+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
import net.minecraft.entity.LivingEntity;
5+
6+
public class EventLivingEntityCallRender extends Event {
7+
private final LivingEntity livingEntity;
8+
9+
public EventLivingEntityCallRender(LivingEntity livingEntity) {
10+
this.livingEntity = livingEntity;
11+
}
12+
13+
public LivingEntity getLivingEntity() {
14+
return livingEntity;
15+
}
16+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
import net.minecraft.client.model.ModelPart;
5+
import net.minecraft.client.render.entity.model.PlayerEntityModel;
6+
7+
import java.util.ArrayList;
8+
9+
public class EventPlayerEntityGetBodyParts extends Event {
10+
private final PlayerEntityModel<?> playerEntityModel;
11+
private final ArrayList<ModelPart> bodyParts;
12+
13+
public EventPlayerEntityGetBodyParts(PlayerEntityModel<?> playerEntityModel, ArrayList<ModelPart> bodyParts) {
14+
this.playerEntityModel = playerEntityModel;
15+
this.bodyParts = bodyParts;
16+
}
17+
18+
public ArrayList<ModelPart> getBodyParts() {
19+
return bodyParts;
20+
}
21+
22+
public PlayerEntityModel<?> getPlayerEntityModel() {
23+
return playerEntityModel;
24+
}
25+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
import net.minecraft.client.model.Dilation;
5+
import net.minecraft.client.model.ModelData;
6+
7+
public class EventPlayerEntityTexturedModelData extends Event {
8+
private final ModelData modelData;
9+
private final Dilation dilation;
10+
11+
public EventPlayerEntityTexturedModelData(ModelData modelData, Dilation dilation) {
12+
this.modelData = modelData;
13+
this.dilation = dilation;
14+
}
15+
16+
public ModelData getModelData() {
17+
return modelData;
18+
}
19+
20+
public Dilation getDilation() {
21+
return dilation;
22+
}
23+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
5+
public class EventRenderBodyPart extends Event {
6+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package me.dustin.jex.event.render;
2+
3+
import me.dustin.events.core.Event;
4+
import net.minecraft.entity.LivingEntity;
5+
6+
public class EventShouldFlipUpsideDown extends Event {
7+
private final LivingEntity livingEntity;
8+
private boolean flip;
9+
10+
public EventShouldFlipUpsideDown(LivingEntity livingEntity, boolean flip) {
11+
this.livingEntity = livingEntity;
12+
this.flip = flip;
13+
}
14+
15+
public LivingEntity getLivingEntity() {
16+
return livingEntity;
17+
}
18+
19+
public boolean isFlip() {
20+
return flip;
21+
}
22+
23+
public void setFlip(boolean flip) {
24+
this.flip = flip;
25+
}
26+
}

src/main/java/me/dustin/jex/feature/mod/impl/render/Nametag.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.mojang.blaze3d.systems.RenderSystem;
55
import me.dustin.events.core.EventListener;
66
import me.dustin.events.core.annotate.EventPointer;
7+
import me.dustin.jex.helper.addon.ears.EarsHelper;
78
import me.dustin.jex.helper.addon.hat.HatHelper;
89
import me.dustin.jex.event.render.EventRender2D;
910
import me.dustin.jex.event.render.EventRender3D;
@@ -174,11 +175,15 @@ public Nametag() {
174175
float offset = entity.getHeight() + 0.2f;
175176
if (entity instanceof PlayerEntity playerEntity) {
176177
if (HatHelper.INSTANCE.hasHat(playerEntity)) {
177-
if (HatHelper.INSTANCE.getType(playerEntity) == HatHelper.HatType.TOP_HAT || playerEntity.getEquippedStack(EquipmentSlot.HEAD).getItem() == Items.DRAGON_HEAD)
178+
if (HatHelper.INSTANCE.getType(playerEntity) == HatHelper.HatType.TOP_HAT || playerEntity.getEquippedStack(EquipmentSlot.HEAD).getItem() == Items.DRAGON_HEAD || EarsHelper.INSTANCE.hasEars(playerEntity.getUuidAsString().replace("-", "")))
178179
offset = entity.getHeight() + 0.7f;
179180
else
180181
offset = entity.getHeight() + 0.4f;
181182
}
183+
if (EarsHelper.INSTANCE.hasEars(playerEntity.getUuidAsString().replace("-", ""))) {
184+
if (offset < entity.getHeight() + 0.4f)
185+
offset = entity.getHeight() + 0.4f;
186+
}
182187
}
183188
Vec3d vec = Render2DHelper.INSTANCE.getPos(entity, offset, event.getPartialTicks(), event.getPoseStack());
184189
if (entity instanceof ItemEntity itemEntity) {

0 commit comments

Comments
 (0)