Skip to content

Commit

Permalink
0.6.9
Browse files Browse the repository at this point in the history
Added Reverse Animation frames button
Added /cpm detect command (Closes #450)
Added the ability to bind quick access key with Right Click (Closes #334)

Fixed UV boxes not rendering in 1.20 (Closes #436)
Fixed property menu crashing if value layer is added (Closes #438)
Fixed crash and visual bugs with some other mods on Forge (Closes #372)
Fixed closing in editor chat closes the Editor on 1.19+
Fixed z-fighting issues in the editor on 1.20
Fixed commands not working on 1.20
Fixed commands not working without a specified player
Fixed animation restarting when clicking the on the model (Closes #446)
Fixed /cpm commands not failing correctly

Web:
Added paste site support (Closes #370)
Fixed wiki reader not loading images

Blockbench:
Animation importer beta
Added visible and color filter animations to Blockbech

Fixed extrude not displaying correctly in Blockbench

FBXTool:
Convert CPM projects to .GLTF rigged models
  • Loading branch information
tom5454 committed Jul 7, 2023
1 parent 416d2a5 commit e14fb36
Show file tree
Hide file tree
Showing 235 changed files with 10,880 additions and 8,049 deletions.
13,493 changes: 6,841 additions & 6,652 deletions Blockbench/cpm_plugin.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Blockbench/cpm_plugin.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CustomPlayerModels-1.10/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import net.minecraftforge.client.event.RenderLivingEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
Expand Down Expand Up @@ -112,6 +113,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
manager.bindSkin(event.getRenderer().getMainModel(), TextureSheetType.SKIN);
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())manager.unbindClear(event.getRenderer().getMainModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
manager.unbindClear(event.getRenderer().getMainModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextFormatting;

import com.tom.cpl.command.StringCommandHandler;
import com.tom.cpl.text.IText;
Expand Down Expand Up @@ -70,11 +67,6 @@ public void sendSuccess(ICommandSender sender, IText text) {
}
}

@Override
public void sendFail(ICommandSender sender, IText text) {
sender.addChatMessage(text.<ITextComponent>remap().setStyle(new Style().setColor(TextFormatting.RED)));
}

@Override
public CommandException generic(String text, Object... format) {
return new CommandException(text, format);
Expand Down
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.12/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import net.minecraftforge.client.event.RenderLivingEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
Expand Down Expand Up @@ -113,6 +114,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
manager.bindSkin(event.getRenderer().getMainModel(), TextureSheetType.SKIN);
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())manager.unbindClear(event.getRenderer().getMainModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
manager.unbindClear(event.getRenderer().getMainModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextFormatting;

import com.tom.cpl.command.StringCommandHandler;
import com.tom.cpl.text.IText;
Expand Down Expand Up @@ -70,11 +67,6 @@ public void sendSuccess(ICommandSender sender, IText text) {
}
}

@Override
public void sendFail(ICommandSender sender, IText text) {
sender.sendMessage(text.<ITextComponent>remap().setStyle(new Style().setColor(TextFormatting.RED)));
}

@Override
public CommandException generic(String text, Object... format) {
return new CommandException(text, format);
Expand Down
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.14/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
Expand All @@ -40,6 +41,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getPlayer(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getRenderer().getModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public RedirectHolderApi(PlayerRenderManager mngr, BipedModel<LivingEntity> mode
}

@Override
protected boolean isInGui() {
protected boolean isDirectMode() {
return true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSource> ctx, String id) throws
public void sendSuccess(CommandSource sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSource sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.15/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
Expand All @@ -40,6 +41,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getPlayer(), event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public RedirectHolderApi(PlayerRenderManager mngr, BipedModel<LivingEntity> mode
}

@Override
protected boolean isInGui() {
protected boolean isDirectMode() {
return true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSource> ctx, String id) throws
public void sendSuccess(CommandSource sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSource sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.16/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
Expand All @@ -40,6 +41,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getPlayer(), event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public RedirectHolderApi(PlayerRenderManager mngr, BipedModel<LivingEntity> mode
}

@Override
protected boolean isInGui() {
protected boolean isDirectMode() {
return true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSource> ctx, String id) throws
public void sendSuccess(CommandSource sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSource sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.17/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
Expand Down Expand Up @@ -52,6 +53,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getPlayer(), event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getBuffers(), event.getRenderer().getModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSourceStack> ctx, String id) th
public void sendSuccess(CommandSourceStack sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSourceStack sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.18/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
Expand Down Expand Up @@ -52,6 +53,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getPlayer(), event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSourceStack> ctx, String id) th
public void sendSuccess(CommandSourceStack sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSourceStack sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.19.3/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
Expand Down Expand Up @@ -55,6 +56,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getEntity(), event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
Expand Down Expand Up @@ -100,9 +106,6 @@ public void clientTick(ClientTickEvent evt) {

@SubscribeEvent
public void openGui(ScreenEvent.Opening openGui) {
if(openGui.getScreen() == null && minecraft.screen instanceof GuiImpl.Overlay) {
openGui.setNewScreen(((GuiImpl.Overlay) minecraft.screen).getGui());
}
if(openGui.getScreen() instanceof TitleScreen && EditorGui.doOpenEditor()) {
openGui.setNewScreen(new GuiImpl(EditorGui::new, openGui.getScreen()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,10 @@ public void render(PoseStack st, int mouseX, int mouseY, float partialTicks) {
super.render(st, mouseX, mouseY, partialTicks);
}

public Screen getGui() {
return GuiBase.this;
@Override
public void removed() {
super.removed();
minecraft.tell(() -> minecraft.setScreen(GuiBase.this));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ protected Object getPlayer(CommandContext<CommandSourceStack> ctx, String id) th
public void sendSuccess(CommandSourceStack sender, IText text) {
sender.sendSuccess(text.remap(), true);
}

@Override
public void sendFail(CommandSourceStack sender, IText text) {
sender.sendFailure(text.remap());
}
}
2 changes: 1 addition & 1 deletion CustomPlayerModels-1.19.4/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=0.6.8a
mod_version=0.6.9a
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.RenderTickEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
Expand Down Expand Up @@ -55,6 +56,11 @@ public void playerRenderPre(RenderPlayerEvent.Pre event) {
playerRenderPre(event.getEntity(), event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
public void playerRenderPreC(RenderPlayerEvent.Pre event) {
if(event.isCanceled())playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
}

@SubscribeEvent
public void playerRenderPost(RenderPlayerEvent.Post event) {
playerRenderPost(event.getMultiBufferSource(), event.getRenderer().getModel());
Expand Down Expand Up @@ -100,9 +106,6 @@ public void clientTick(ClientTickEvent evt) {

@SubscribeEvent
public void openGui(ScreenEvent.Opening openGui) {
if(openGui.getScreen() == null && minecraft.screen instanceof GuiImpl.Overlay) {
openGui.setNewScreen(((GuiImpl.Overlay) minecraft.screen).getGui());
}
if(openGui.getScreen() instanceof TitleScreen && EditorGui.doOpenEditor()) {
openGui.setNewScreen(new GuiImpl(EditorGui::new, openGui.getScreen()));
}
Expand Down
Loading

0 comments on commit e14fb36

Please sign in to comment.