diff --git a/build.gradle b/build.gradle index e5f8dd3bd..486d4a485 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '0.0.5' +version = 'mc1.14.4_v0.0.5' group = 'com.simibubi.create' archivesBaseName = 'create' @@ -22,19 +22,8 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co minecraft { mappings channel: 'snapshot', version: '20190806-1.14.3' - runs { - createDev { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - create { - source sourceSets.main - } - } - } - - createSimi { + runs { + client { workingDirectory project.file('run') property 'forge.logging.console.level', 'info' mods { @@ -44,7 +33,7 @@ minecraft { } } - createServer { + server { workingDirectory project.file('run') property 'forge.logging.console.level', 'info' mods { @@ -54,7 +43,7 @@ minecraft { } } - createData { + data { workingDirectory project.file('run') property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'debug' @@ -77,7 +66,7 @@ jar { attributes([ "Specification-Title": "create", "Specification-Vendor": "simibubi", - "Specification-Version": "1", // We are version 1 of ourselves + "Specification-Version": "1", "Implementation-Title": project.name, "Implementation-Version": "${version}", "Implementation-Vendor" :"simibubi", diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java index 5efc0787d..0c5fded72 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java @@ -42,6 +42,7 @@ public class SelectionScrollInput extends ScrollInput { result.append(TextFormatting.GRAY).append("> ").append(options.get(i)); toolTip.add(result.toString()); } + toolTip.add(TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + "Scroll to Select"); } } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java index 4b7f94089..7edfdbd06 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java @@ -120,7 +120,7 @@ public class BuilderGunHandler { if (player == null) return; cachedBeams.removeIf(b -> b.itensity < .1f); - cachedBeams.forEach(b -> b.itensity *= .7f); + cachedBeams.forEach(b -> b.itensity *= .4f); lastLeftHandAnimation = leftHandAnimation; lastRightHandAnimation = rightHandAnimation; diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java index d68e40301..7cc1578b2 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java @@ -52,8 +52,9 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen availableSchematics = Create.cSchematicLoader.getAvailableSchematics(); + schematicsLabel = new Label(mainLeft + 36, mainTop + 26, "").withShadow(); + schematicsLabel.text = ""; if (!availableSchematics.isEmpty()) { - schematicsLabel = new Label(mainLeft + 36, mainTop + 26, "").withShadow(); schematicsArea = new SelectionScrollInput(mainLeft + 33, mainTop + 23, 134, 14).forOptions(availableSchematics) .titled("Available Schematics").writingTo(schematicsLabel); widgets.add(schematicsArea); @@ -186,9 +187,15 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen availableSchematics = Create.cSchematicLoader.getAvailableSchematics(); widgets.remove(schematicsArea); - schematicsArea = new SelectionScrollInput(guiLeft - 56 + 33, guiTop - 16 + 23, 134, 14).forOptions(availableSchematics) - .titled("Available Schematics").writingTo(schematicsLabel); - widgets.add(schematicsArea); + + if (!availableSchematics.isEmpty()) { + schematicsArea = new SelectionScrollInput(guiLeft - 56 + 33, guiTop - 16 + 23, 134, 14).forOptions(availableSchematics) + .titled("Available Schematics").writingTo(schematicsLabel); + widgets.add(schematicsArea); + } else { + schematicsArea = null; + schematicsLabel.text = ""; + } } return super.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_); diff --git a/src/main/java/com/simibubi/create/modules/symmetry/SymmetryWandItem.java b/src/main/java/com/simibubi/create/modules/symmetry/SymmetryWandItem.java index f2b534884..996f1abbf 100644 --- a/src/main/java/com/simibubi/create/modules/symmetry/SymmetryWandItem.java +++ b/src/main/java/com/simibubi/create/modules/symmetry/SymmetryWandItem.java @@ -267,7 +267,7 @@ public class SymmetryWandItem extends Item { continue; } else { targets.add(position); - world.playEvent(2001, pos, Block.getStateId(blockstate)); + world.playEvent(2001, position, Block.getStateId(blockstate)); world.setBlockState(position, air, 3); if (!player.isCreative()) { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 57effd04a..34dcf7b82 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ loaderVersion="[28,)" [[mods]] modId="create" -version="0.0.4" +version="0.0.5" displayName="Create" #updateJSONURL="" authors="simibubi"