Skip to content

Commit

Permalink
Minecraft 1.15 pre1
Browse files Browse the repository at this point in the history
  • Loading branch information
kyrptonaught committed Nov 23, 2019
1 parent af92fcc commit 7f9c39e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 23 deletions.
19 changes: 7 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.2.5-SNAPSHOT'
id 'fabric-loom' version '0.2.6-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -12,17 +12,19 @@ group = project.maven_group

minecraft {
}

repositories {
maven { url 'https://maven.fabricmc.net/io/github/prospector/modmenu/ModMenu/' }
}
dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}"
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation "io.github.prospector.modmenu:ModMenu:+"
modImplementation "io.github.prospector:modmenu:1.7.15-unstable.1.15-pre1+build.13"

modImplementation ('me.shedaniel.cloth:config-2:1.2.1'){transitive = false}
include 'me.shedaniel.cloth:config-2:1.2.1'
modImplementation ('me.shedaniel.cloth:config-2:+'){transitive = false}
include 'me.shedaniel.cloth:config-2:+'

modApi "blue.endless:jankson:+"
include "blue.endless:jankson:+"
Expand Down Expand Up @@ -73,11 +75,4 @@ publishing {
}
}
}

// select the repositories you want to publish to
repositories {
// uncomment to publish to the local maven
// mavenLocal()
maven { url 'https://maven.fabricmc.net/io/github/prospector/modmenu/ModMenu/' }
}
}
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.14.4
yarn_mappings=1.14.4+build.13
loader_version=0.6.2+build.166
minecraft_version=1.15-pre1
yarn_mappings=1.15-pre1+build.3:v2
loader_version=0.7.1+build.173

# Mod Properties
mod_version=1.0.6
mod_version=1.1.0
maven_group = net.fabricmc
archives_base_name=diggusmaximus

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.4.0+build.240-1.14
fabric_version=0.4.13+build.264-1.15
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public static boolean isKeybindPressed() {
if (keycode == null)
keycode = InputUtil.fromName(getOptions().keybinding);
if (keycode.getCategory() == InputUtil.Type.MOUSE)
return GLFW.glfwGetMouseButton(MinecraftClient.getInstance().window.getHandle(), keycode.getKeyCode()) == 1;
return GLFW.glfwGetKey(MinecraftClient.getInstance().window.getHandle(), keycode.getKeyCode()) == 1;
return GLFW.glfwGetMouseButton(MinecraftClient.getInstance().getWindow().getHandle(), keycode.getKeyCode()) == 1;
return GLFW.glfwGetKey(MinecraftClient.getInstance().getWindow().getHandle(), keycode.getKeyCode()) == 1;
}

public static ConfigOptions getOptions() {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/kyrptonaught/diggusmaximus/Excavate.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.kyrptonaught.diggusmaximus;

import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.server.world.ServerWorld;
Expand Down Expand Up @@ -54,7 +55,7 @@ private void spread(BlockPos pos) {
point(pos.south());
point(pos.west());
point(pos.up());
point(pos.down());
point(pos.down(1));
}
}

Expand All @@ -75,7 +76,7 @@ private void mine(BlockPos pos) {
tool.postMine(world, world.getBlockState(pos), pos, player);
player.incrementStat(Stats.MINED.getOrCreateStat(startBlock));
dropStacks(world, pos);
world.clearBlockState(pos, false);
world.setBlockState(pos, Blocks.AIR.getDefaultState());
startBlock.onBroken(world, pos, world.getBlockState(pos));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public boolean keyPressed(int int_1, int int_2, int int_3) {
@Override
public void render(int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
super.render(index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
Window window = MinecraftClient.getInstance().window;
Window window = MinecraftClient.getInstance().getWindow();
this.resetButton.active = isEditable() && getDefaultValue().isPresent() && defaultValue.get() != keyValue;
this.resetButton.y = y;
this.buttonWidget.active = isEditable();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "diggusmaximus",
"version": "1.0.6",
"version": "1.1.0",
"name": "Diggus Maximus",
"description": "Mine ores more better!",
"authors": [
Expand Down

0 comments on commit 7f9c39e

Please sign in to comment.