Finish first try at porting to 1.21.11
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
This commit is contained in:
parent
90d4e7b8b4
commit
019e62f33b
@ -51,7 +51,7 @@ object RenderingUtil {
|
||||
Matrix4f()
|
||||
)
|
||||
fun renderBufferWithPipeline(
|
||||
name: String? = "Dynamic vertex buffer",
|
||||
name: String = "Dynamic vertex buffer",
|
||||
renderPipeline: RenderPipeline,
|
||||
renderTarget: RenderTarget = Minecraft.getInstance().mainRenderTarget,
|
||||
uniformAndSamplerConsumer: ((RenderPass) -> Unit)? = null,
|
||||
|
||||
@ -25,14 +25,11 @@ abstract class KeyMappings {
|
||||
|
||||
@Inject(method = "<init>*", at = @At("RETURN"))
|
||||
private void onSettingsConstructed(Minecraft minecraft, File file, CallbackInfo ci) {
|
||||
final var categoryMap = KeysAccessor.getSortedCategoryMap();
|
||||
final var categoryList = KeysAccessor.getSortedCategoryList();
|
||||
var newKeys = Lists.newArrayList(keyMappings);
|
||||
for (KeyMapping key : keysToAdd) {
|
||||
if (!categoryMap.containsKey(key.getCategory())) {
|
||||
Optional<Integer> biggest = categoryMap.values().stream().max(Integer::compareTo);
|
||||
int biggestInt = biggest.orElse(0);
|
||||
categoryMap.put(key.getCategory(), biggestInt + 1);
|
||||
}
|
||||
if (!categoryList.contains(key.getCategory()))
|
||||
categoryList.add(key.getCategory());
|
||||
newKeys.remove(key);
|
||||
newKeys.add(key);
|
||||
}
|
||||
|
||||
@ -4,10 +4,10 @@ import net.minecraft.client.KeyMapping;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(KeyMapping.class)
|
||||
@Mixin(KeyMapping.Category.class)
|
||||
public interface KeysAccessor {
|
||||
@Accessor("CATEGORY_SORT_ORDER")
|
||||
static Map<String, Integer> getSortedCategoryMap() { throw new AssertionError(); }
|
||||
@Accessor("SORT_ORDER")
|
||||
static List<KeyMapping.Category> getSortedCategoryList() { throw new AssertionError(); }
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ class FabricInit: Snowy(), ClientModInitializer {
|
||||
EVENT.register(
|
||||
object: HudRenderCallback, EventSnowy {
|
||||
override val type: String = "HudRender"
|
||||
override fun onHudRender(guiGraphics: GuiGraphics?, tickCounter: DeltaTracker?) = fire(guiGraphics)
|
||||
override fun onHudRender(guiGraphics: GuiGraphics, tickCounter: DeltaTracker) = fire(guiGraphics)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user