Skip to content

Commit 97ae9fa

Browse files
m1919810m1919810
committed
feat: fix all for 1.21.11
1 parent 7314193 commit 97ae9fa

File tree

15 files changed

+126
-94
lines changed

15 files changed

+126
-94
lines changed

‎src/main/java/me/matl114/events/RenderListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void init(){
3535
@Modifiable
3636
@Cancelable
3737
@ExtraArgs(value = {ItemStack.class}, names = {"originalItemStack"})
38-
private static final EventChannel<ItemModel> customModelOverride = new EventChannel<>();
38+
private static final EventChannel<Identifier> customModelOverride = new EventChannel<>();
3939

4040
public static Identifier wrapAsModModel(Identifier id){
4141
return id;

‎src/main/java/me/matl114/gui/basic/DrawableWidget.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ public <T extends DrawableWidget> T updateRenderHandler(UnaryOperator<RenderHand
122122
*/
123123
@Override
124124
public final void render(DrawContext context, int mouseX, int mouseY, float delta) {
125-
render0(VDrawContext.of(context), mouseX, mouseY, delta, false);
125+
VDrawContext vd = VDrawContext.of(context);
126+
render0(vd, mouseX, mouseY, delta, false);
127+
vd.tryDraw();
126128
}
127129
protected void checkSelect(boolean disableSelect, int mouseX, int mouseY){
128130
this.selected = !disableSelect && isMouseOver(mouseX, mouseY);
@@ -155,7 +157,6 @@ public void renderInDefaultMatrix(VDrawContext context, int mouseX, int mouseY,
155157
public void renderAbsolute(VDrawContext context, int mouseX, int mouseY, float delta, boolean disableSelect){
156158
if(this.renderHandler != null){
157159
this.renderHandler.renderExtraAbsoluteCoord(this, context, mouseX, mouseY , delta, this.alpha, this.selected);
158-
context.tryDraw();
159160
}
160161
}
161162

‎src/main/java/me/matl114/gui/other/ChatLikeInputSubScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
8484

8585
@Override
8686
public void renderInDefaultMatrix(VDrawContext context, int mouseX, int mouseY, float delta, boolean disableSelect) {
87-
super.renderInDefaultMatrix(context, mouseX, mouseY, delta, disableSelect);
8887
//draw gray background for chatField
88+
//sb ojng
8989
context.fill(0,-2, this.chatFieldWidget.getWidth(), this.chatFieldWidget.getHeight() -2, mc.options.getTextBackgroundColor(Integer.MIN_VALUE));
9090
RenderHandler.drawHighlightFrame(context, -1, -3, this.chatFieldWidget.getWidth() + 2, this.chatFieldWidget.getHeight() + 2, this.isFocused() ? Colors.WHITE : Colors.GRAY);
91+
super.renderInDefaultMatrix(context, mouseX, mouseY, delta, disableSelect);
9192
}
9293

9394
public boolean mouseClicked(double mouseX, double mouseY, int button) {

‎src/main/java/me/matl114/hacks/ChatTasks.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
import me.matl114.hacks.api.ModuleManager;
1414
import me.matl114.hacks.api.ModulePreset;
1515
import me.matl114.hacks.modules.HackModules;
16-
import me.matl114.hacks.modules.chat.AutoChat;
17-
import me.matl114.hacks.modules.chat.ChatCombine;
18-
import me.matl114.hacks.modules.chat.ChatExtra;
19-
import me.matl114.hacks.modules.chat.ClientSideCommand;
16+
import me.matl114.hacks.modules.chat.*;
2017
import me.matl114.events.Listener;
2118
import me.matl114.hacks.modules.combat.Attack;
2219
import me.matl114.hacks.modules.combat.BowEnhance;
@@ -73,6 +70,8 @@ public static void init(){
7370
public static ClientSideCommand clientSideCommand;
7471
@Getter
7572
public static ChatCombine chatCombine;
73+
@Getter
74+
public static InGuiChatBox inGuiChatBox;
7675

7776
private static void initModules(ModuleManager m){
7877
chatExtra = new ChatExtra()
@@ -86,6 +85,8 @@ private static void initModules(ModuleManager m){
8685

8786
chatCombine = new ChatCombine()
8887
.register(m);
88+
inGuiChatBox = new InGuiChatBox()
89+
.register(m);
8990
}
9091
static{
9192
moduleManager.registerFactories(ChatTasks::initModules);
@@ -479,6 +480,11 @@ private void onResource0(String name, List datas){
479480
.select(List.of("confirm"), "")
480481
.build()
481482
)
483+
.arg(
484+
SimpleCommandArgs.argumentBuilder()
485+
.name("display")
486+
.build()
487+
)
482488
.post(e -> e.executor(CommandContext.run(this::onSleep)))
483489
.complete();
484490
}
@@ -489,8 +495,9 @@ public void onSleep(ArgumentInputStream re){
489495
return ;
490496
}
491497
String val = re.nextNonnull();
498+
String val2 = re.nextArg();
492499
if("confirm".equals(val)){
493-
Tasks.scheduleDelayed(()->RenderTasks.getSleepMode().setScreenSleeping(level), 1);
500+
Tasks.scheduleDelayed(()->RenderTasks.getSleepMode().setCustomScreenSleeping(level, val2), 1);
494501
}else {
495502
Debug.chat("使用sleep confirm 确认进入睡眠模式, 进入睡眠模式后可以按 "+ RenderTasks.getSleepMode().getWakeupButton() +" 键离开");
496503
}

‎src/main/java/me/matl114/hacks/CombatTasks.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ public static Vec2f calculatePitchYawPredict(float velocity, Vec3d extraVector,
213213
@Getter
214214
public static BowEnhance bowEnhance;
215215
@Getter
216+
public static AutoTotem autoTotem;
217+
@Getter
216218
public static ProjectileEnhance projectileEnhance;
217219
private static void initModules(ModuleManager m){
218220
combatExtra = new CombatExtra()
@@ -229,6 +231,8 @@ private static void initModules(ModuleManager m){
229231
.register(m);
230232
projectileEnhance = new ProjectileEnhance()
231233
.register(m);
234+
autoTotem = new AutoTotem()
235+
.register(m);
232236
}
233237
static {
234238
moduleManager.registerFactories(CombatTasks::initModules);

‎src/main/java/me/matl114/hacks/MineTasks.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void onSeedOre(ArgumentInputStream re){
9797
}
9898
{
9999
main.subBuilder(SubCommand.taskBuilder())
100-
.name("seedore")
100+
.name("seed")
101101
.helper("<operation> <seed> 进行seed操作")
102102
.arg(
103103
SimpleCommandArgs.argumentBuilder()

‎src/main/java/me/matl114/hacks/modules/models/NewStyleModel.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public void registerAll() {
5757
}
5858
private Map<Identifier, Optional<ItemModel>> cache = new HashMap<>();
5959

60-
private Map<Item, Optional<ItemModel>> cacheItem = new HashMap<>();
60+
private Map<Item, Identifier> cacheItem = new HashMap<>();
6161

62-
public void onModelOverride(Event<ItemModel> event) {
62+
public void onModelOverride(Event<Identifier> event) {
6363
if(event.context != null)return;
6464
ItemStack item = event.getArgs(0);
6565
if(enableEnchant.get()){
@@ -79,15 +79,17 @@ public void onModelOverride(Event<ItemModel> event) {
7979

8080
Identifier id = ( level == 1 ? new Identifier(NAMESPACE, MODEL_PATH+ identifier2.getPath()) :(level == maxValue? new Identifier(NAMESPACE, MODEL_PATH+ identifier2.getPath()+MAX_VALUE):(level > maxValue? new Identifier(NAMESPACE, MODEL_PATH+ identifier2.getPath()+OVER_MAX_VALUE) : new Identifier(NAMESPACE, MODEL_PATH+ identifier2.getPath()+ "_"+ level)) ));
8181
Optional<ItemModel> modelId = cache.computeIfAbsent(id, RenderListener::getModModel);
82-
modelId.ifPresent(event::context);
82+
if(modelId.isPresent()){
83+
event.context(id);
84+
}
8385
}
8486
}
8587
}
8688
}
8789
if(shouldEnableNewStyle(item)){
8890
var model = cacheItem.get(item.getItem());
89-
if(model != null && model.isPresent()){
90-
event.context(model.get());
91+
if(model != null){
92+
event.context(model);
9193
}
9294
}
9395

@@ -100,7 +102,7 @@ public void onRefreshCache(Event<ResourceManager> event) {
100102
Optional<ItemModel> modelId = RenderListener.getModModel(id);
101103
//todo: what?
102104
if(modelId.isPresent()){
103-
cacheItem.put(item, modelId);
105+
cacheItem.put(item, id);
104106
Debug.info("Loading new-version model",id);
105107
}
106108
}

‎src/main/java/me/matl114/hacks/modules/models/SlimefunModels.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void onModelSupply(Event<Set<Identifier>> event) {
7070
}
7171
}
7272

73-
public void onModelOverride(Event<ItemModel> event) {
73+
public void onModelOverride(Event<Identifier> event) {
7474
if(event.context != null)return;
7575

7676
if(enableModel.get()){
@@ -83,7 +83,7 @@ public void onModelOverride(Event<ItemModel> event) {
8383
if(identifier != null){
8484
Optional<ItemModel> modelOptional = modelCache.computeIfAbsent(identifier, RenderListener::getOptionalModelOf);
8585
if(modelOptional.isPresent()){
86-
event.context(modelOptional.get());
86+
event.context(identifier);
8787
return;
8888
}
8989
}

‎src/main/java/me/matl114/hacks/modules/models/StorageDisplay.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,17 @@ public void onProductsSpecialPlugin(Event<ItemStack> event) {
187187
}
188188
}
189189

190-
public void onGceChickenModel(Event<ItemModel> IItemModelEvent){
190+
public void onGceChickenModel(Event<Identifier> IItemModelEvent){
191191
if(IItemModelEvent.context() != null)return;
192192
if(isActive()){
193193
ItemStack stack = IItemModelEvent.getArgs(0);
194194
String optionalChicken = handlePureChickenDNAInfo(stack);
195195
if(optionalChicken!=null ){
196196
String val = dnaInfo.get(optionalChicken);
197197
if(val != null){
198-
RenderListener.getModModel(new Identifier("slimefunhelper","gce/"+val))
199-
.ifPresent(IItemModelEvent::context);
198+
Identifier id = new Identifier("slimefunhelper","gce/"+val);
199+
RenderListener.getModModel(id)
200+
.ifPresent((v)-> IItemModelEvent.context(id));
200201
}
201202
}
202203
}

‎src/main/java/me/matl114/hacks/modules/render/SleepMode.java‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,14 @@ public boolean wakeUpScreen(){
8787
else return false;
8888
}
8989
public boolean setScreenSleeping(int s){
90+
return setCustomScreenSleeping(s, null);
91+
}
92+
public boolean setCustomScreenSleeping(int s, String sleep){
9093
if(sleepingLevel != s){
9194

9295
if(s != 0){
9396
sleepingLevel = s;
94-
setUpSleepingScreen();
97+
setUpSleepingScreen(sleep == null ? getDefaultDisplayText() : Text.literal(sleep));
9598
}else {
9699
//sleeping = false;
97100
sleepingLevel = s;
@@ -115,15 +118,16 @@ public Screen getCurrentRenderingSleeping(){
115118
return currentRenderingSleeping;
116119
}
117120
private class SleepingChatScreen extends ChatScreen implements SleepOverlay {
118-
119-
public SleepingChatScreen(String originalChatText) {
121+
Text displayMessage;
122+
public SleepingChatScreen(String originalChatText, Text displayMessage) {
120123
super(originalChatText, false);
124+
this.displayMessage = displayMessage;
121125
}
122126
protected void init(){
123127
super.init();
124128
sleepingScreenInstance = this;
125129
DisplayWidget.instance(this.width - 80, 0, 80, 40)
126-
.setRenderHandler(LabelElement.instance(Text.literal("按 "+ getWakeupButton() +" 键退出休眠模式")))
130+
.setRenderHandler(LabelElement.instance(displayMessage))
127131
.addTo(this);
128132
shouldFreshSleepScreen = true;
129133
}
@@ -161,16 +165,18 @@ public void close() {
161165
}
162166
}
163167
private class SleepingScreen extends Screen implements SafeSleepingScreen{
164-
protected SleepingScreen(Text title) {
168+
Text displayMessage;
169+
protected SleepingScreen(Text title, Text displayMessage) {
165170
super(title);
171+
this.displayMessage = displayMessage;
166172
}
167173

168174
@Override
169175
protected void init() {
170176
super.init();
171177
sleepingScreenInstance = this;
172178
DisplayWidget.instance(40, 40, this.width - 80, this.height - 80)
173-
.setRenderHandler(LabelElement.instance(Text.literal("按 "+ getWakeupButton() +" 键退出休眠模式")))
179+
.setRenderHandler(LabelElement.instance(displayMessage))
174180
.addTo(this);
175181
shouldFreshSleepScreen = true;
176182
}
@@ -200,7 +206,7 @@ protected void init() {
200206
if(isScreenSleeping()){
201207
if(ClientUtils.isPlayerOnline()){
202208
sleepingScreenInstance = null;
203-
setUpSleepingScreen();
209+
setUpSleepingScreen(getDefaultDisplayText());
204210
}else{
205211
//keep this screen
206212
}
@@ -215,18 +221,21 @@ public void renderBackground(DrawContext context, int mouseX, int mouseY, float
215221

216222
}
217223
}
224+
private Text getDefaultDisplayText(){
225+
return Text.literal("按 "+ getWakeupButton() +" 键退出休眠模式");
226+
}
218227
private static interface SafeSleepingScreen extends SleepOverlay {
219228
//screen which implement this can keep even when player exit game, which means it does not need mc.player or mc.world or sth
220229
}
221230
//
222-
public void setUpSleepingScreen(){
231+
public void setUpSleepingScreen(Text display){
223232
if(sleepingScreenInstance == null){
224233
switch (sleepingLevel){
225234
case 1:
226-
sleepingScreenInstance = new SleepingChatScreen("");
235+
sleepingScreenInstance = new SleepingChatScreen("", display);
227236
break;
228237
default:
229-
sleepingScreenInstance = new SleepingScreen(Text.empty());
238+
sleepingScreenInstance = new SleepingScreen(Text.empty(), display);
230239
break;
231240
}
232241
}
@@ -312,7 +321,7 @@ public boolean sleepingRenderTick(GameRenderer gameRenderer, RenderTickCounter t
312321
mc.gameRenderer.pool.decrementLifespan();
313322
}
314323
}else {
315-
setUpSleepingScreen();
324+
setUpSleepingScreen(getDefaultDisplayText());
316325
}
317326
return true;
318327
}

0 commit comments

Comments
 (0)