Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Ellpeck/Nyx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Rebirth-of-the-Night/Nyx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jan 19, 2021

  1. Decrease bow damage

    CalaMariGold authored Jan 19, 2021
    Copy the full SHA
    61aa590 View commit details
  2. Copy the full SHA
    96b21e7 View commit details

Commits on Jan 25, 2021

  1. Copy the full SHA
    b549c36 View commit details

Commits on Mar 17, 2021

  1. Add item config option

    democat3457 authored Mar 17, 2021
    Copy the full SHA
    c23a7a8 View commit details
  2. Unused imports

    democat3457 committed Mar 17, 2021
    Copy the full SHA
    c16083e View commit details
  3. Copy the full SHA
    901af72 View commit details
  4. version bump

    democat3457 committed Mar 17, 2021
    Copy the full SHA
    7def3e0 View commit details
  5. Copy the full SHA
    406357b View commit details

Commits on Apr 12, 2021

  1. Add clear cache command

    democat3457 committed Apr 12, 2021
    Copy the full SHA
    b006402 View commit details

Commits on Apr 14, 2021

  1. Copy the full SHA
    a5dade3 View commit details
  2. Fix potion effects

    democat3457 committed Apr 14, 2021
    Copy the full SHA
    c416f50 View commit details
  3. Scythe drop blacklist

    democat3457 committed Apr 14, 2021
    Copy the full SHA
    5766652 View commit details
  4. Copy the full SHA
    6675fcd View commit details

Commits on Apr 15, 2021

  1. Version 1.4.6

    - Falling star volume is now configurable
    - Added scythe drop chances to prevent dupes and add customizability
    democat3457 committed Apr 15, 2021
    Copy the full SHA
    daa4adc View commit details

Commits on May 30, 2021

  1. Refactor, minor fixes

    - Changes class names from "Tile" to respective TileEntity names
    - Fixes nyx slab placing in creative mode
    - Use player.isCreative rather than player capabilities
    - Slightly adjust collision box when cauldron is full
    democat3457 committed May 30, 2021
    Copy the full SHA
    7259397 View commit details
  2. Copy the full SHA
    a7ba672 View commit details

Commits on Jun 7, 2021

  1. Switch to AT

    democat3457 committed Jun 7, 2021
    Copy the full SHA
    ffa4c9c View commit details

Commits on Jun 8, 2021

  1. Copy the full SHA
    079c3ff View commit details
  2. Version 1.5.0

    - Changes dimension configs from names to IDs
    - Adds meteor dimension config
    democat3457 committed Jun 8, 2021
    Copy the full SHA
    56075f1 View commit details

Commits on Jun 11, 2021

  1. Config fixes

    democat3457 committed Jun 11, 2021
    Copy the full SHA
    916d25a View commit details

Commits on May 8, 2022

  1. Updated LunarWaterBottle stack size to 16

    Bump version to 1.5.2
    Orf1 authored and democat3457 committed May 8, 2022
    Copy the full SHA
    b25eb6e View commit details

Commits on May 17, 2022

  1. Update meteor_sword.json

    Foreck1 authored May 17, 2022
    Copy the full SHA
    15ac99c View commit details

Commits on May 27, 2022

  1. Copy the full SHA
    c755df8 View commit details
  2. Revamp meteorKillUnloaded

    transformed into meteorCacheEnabled, where if false, completely disables the cache
    democat3457 committed May 27, 2022
    Copy the full SHA
    b0018b6 View commit details
  3. Finally fix? cache

    democat3457 committed May 27, 2022
    Copy the full SHA
    4975871 View commit details

Commits on Jun 5, 2022

  1. Chmod permissions

    democat3457 committed Jun 5, 2022
    Copy the full SHA
    9745318 View commit details

Commits on Jun 6, 2022

  1. Copy the full SHA
    8371196 View commit details

Commits on Jun 14, 2022

  1. Copy the full SHA
    a69d17a View commit details

Commits on Jun 19, 2022

  1. Copy the full SHA
    8058bf7 View commit details

Commits on Jun 20, 2022

  1. Copy the full SHA
    4807de2 View commit details

Commits on Jul 14, 2022

  1. Copy the full SHA
    4cfd892 View commit details
  2. Fill bucket properly

    democat3457 committed Jul 14, 2022
    Copy the full SHA
    8cec128 View commit details
  3. Remove outdated comment

    democat3457 authored Jul 14, 2022
    Copy the full SHA
    ee83e76 View commit details
Showing with 800 additions and 260 deletions.
  1. +2 −2 .gitignore
  2. 0 Jenkinsfile
  3. 0 LICENSE
  4. 0 README.md
  5. +25 −3 build.gradle
  6. +3 −0 gradle.properties
  7. BIN gradle/wrapper/gradle-wrapper.jar
  8. +1 −1 gradle/wrapper/gradle-wrapper.properties
  9. 0 gradlew
  10. 0 gradlew.bat
  11. +143 −21 src/main/java/de/ellpeck/nyx/Config.java
  12. +0 −2 src/main/java/de/ellpeck/nyx/GuiFactory.java
  13. +58 −0 src/main/java/de/ellpeck/nyx/ItemMetaHelper.java
  14. +24 −0 src/main/java/de/ellpeck/nyx/LunarWaterSource.java
  15. +22 −4 src/main/java/de/ellpeck/nyx/Nyx.java
  16. +6 −6 src/main/java/de/ellpeck/nyx/Registry.java
  17. +5 −12 src/main/java/de/ellpeck/nyx/blocks/Crystal.java
  18. 0 src/main/java/de/ellpeck/nyx/blocks/Glass.java
  19. +2 −1 src/main/java/de/ellpeck/nyx/blocks/LunarWater.java
  20. +14 −6 src/main/java/de/ellpeck/nyx/blocks/LunarWaterCauldron.java
  21. 0 src/main/java/de/ellpeck/nyx/blocks/LunarWaterFluid.java
  22. +0 −2 src/main/java/de/ellpeck/nyx/blocks/MeteorRock.java
  23. +0 −4 src/main/java/de/ellpeck/nyx/blocks/NyxSlab.java
  24. 0 src/main/java/de/ellpeck/nyx/blocks/NyxStairs.java
  25. +3 −6 src/main/java/de/ellpeck/nyx/blocks/StarAir.java
  26. +13 −15 src/main/java/de/ellpeck/nyx/capabilities/NyxWorld.java
  27. +49 −0 src/main/java/de/ellpeck/nyx/commands/CommandClearCache.java
  28. +6 −1 src/main/java/de/ellpeck/nyx/commands/CommandForce.java
  29. +21 −4 src/main/java/de/ellpeck/nyx/commands/CommandMeteor.java
  30. +27 −0 src/main/java/de/ellpeck/nyx/compat/CauldronProxy.java
  31. +44 −0 src/main/java/de/ellpeck/nyx/compat/InspirationsProxy.java
  32. +5 −3 src/main/java/de/ellpeck/nyx/enchantments/LunarEdge.java
  33. 0 src/main/java/de/ellpeck/nyx/enchantments/LunarShield.java
  34. 0 src/main/java/de/ellpeck/nyx/enchantments/NyxEnchantment.java
  35. +48 −9 src/main/java/de/ellpeck/nyx/entities/CauldronTracker.java
  36. 0 src/main/java/de/ellpeck/nyx/entities/EmptyRenderer.java
  37. +45 −1 src/main/java/de/ellpeck/nyx/entities/FallingMeteor.java
  38. +2 −6 src/main/java/de/ellpeck/nyx/entities/FallingStar.java
  39. +0 −2 src/main/java/de/ellpeck/nyx/entities/MeteorRenderer.java
  40. +0 −1 src/main/java/de/ellpeck/nyx/entities/WolfAiSpecialMoon.java
  41. +2 −16 src/main/java/de/ellpeck/nyx/events/ClientEvents.java
  42. +109 −44 src/main/java/de/ellpeck/nyx/events/Events.java
  43. 0 src/main/java/de/ellpeck/nyx/items/FallenStar.java
  44. +1 −1 src/main/java/de/ellpeck/nyx/items/ItemNyxSlab.java
  45. +27 −20 src/main/java/de/ellpeck/nyx/items/LunarWaterBottle.java
  46. +2 −2 src/main/java/de/ellpeck/nyx/items/{Axe.java → MeteorAxe.java}
  47. +6 −4 src/main/java/de/ellpeck/nyx/items/{Bow.java → MeteorBow.java}
  48. +8 −1 src/main/java/de/ellpeck/nyx/items/MeteorFinder.java
  49. +2 −2 src/main/java/de/ellpeck/nyx/items/{Hammer.java → MeteorHammer.java}
  50. +2 −2 src/main/java/de/ellpeck/nyx/items/{Pickaxe.java → MeteorPickaxe.java}
  51. +25 −11 src/main/java/de/ellpeck/nyx/items/Scythe.java
  52. +1 −2 src/main/java/de/ellpeck/nyx/lunarevents/BloodMoon.java
  53. 0 src/main/java/de/ellpeck/nyx/lunarevents/FullMoon.java
  54. +1 −1 src/main/java/de/ellpeck/nyx/lunarevents/HarvestMoon.java
  55. 0 src/main/java/de/ellpeck/nyx/lunarevents/LunarEvent.java
  56. +1 −1 src/main/java/de/ellpeck/nyx/lunarevents/StarShower.java
  57. 0 src/main/java/de/ellpeck/nyx/network/PacketHandler.java
  58. +0 −1 src/main/java/de/ellpeck/nyx/network/PacketNyxWorld.java
  59. 0 src/main/java/de/ellpeck/nyx/proxy/ClientProxy.java
  60. 0 src/main/java/de/ellpeck/nyx/proxy/CommonProxy.java
  61. +3 −0 src/main/resources/META-INF/nyx_at.cfg
  62. 0 src/main/resources/assets/nyx/blockstates/chiseled_star_block.json
  63. 0 src/main/resources/assets/nyx/blockstates/cracked_star_block.json
  64. 0 src/main/resources/assets/nyx/blockstates/crystal.json
  65. 0 src/main/resources/assets/nyx/blockstates/fluids.json
  66. 0 src/main/resources/assets/nyx/blockstates/gleaning_meteor_rock.json
  67. 0 src/main/resources/assets/nyx/blockstates/lunar_water_cauldron.json
  68. 0 src/main/resources/assets/nyx/blockstates/meteor_block.json
  69. 0 src/main/resources/assets/nyx/blockstates/meteor_glass.json
  70. 0 src/main/resources/assets/nyx/blockstates/meteor_rock.json
  71. 0 src/main/resources/assets/nyx/blockstates/star_air.json
  72. 0 src/main/resources/assets/nyx/blockstates/star_block.json
  73. 0 src/main/resources/assets/nyx/blockstates/star_slab.json
  74. 0 src/main/resources/assets/nyx/blockstates/star_slab_double.json
  75. 0 src/main/resources/assets/nyx/blockstates/star_stairs.json
  76. +3 −0 src/main/resources/assets/nyx/lang/en_US.lang
  77. 0 src/main/resources/assets/nyx/models/block/chiseled_star_block.json
  78. 0 src/main/resources/assets/nyx/models/block/cracked_star_block.json
  79. 0 src/main/resources/assets/nyx/models/block/crystal.json
  80. 0 src/main/resources/assets/nyx/models/block/gleaning_meteor_rock.json
  81. 0 src/main/resources/assets/nyx/models/block/lunar_water_cauldron.json
  82. 0 src/main/resources/assets/nyx/models/block/lunar_water_cauldron_level1.json
  83. 0 src/main/resources/assets/nyx/models/block/lunar_water_cauldron_level2.json
  84. 0 src/main/resources/assets/nyx/models/block/lunar_water_cauldron_level3.json
  85. 0 src/main/resources/assets/nyx/models/block/meteor_block.json
  86. 0 src/main/resources/assets/nyx/models/block/meteor_glass.json
  87. 0 src/main/resources/assets/nyx/models/block/meteor_rock.json
  88. 0 src/main/resources/assets/nyx/models/block/star_air.json
  89. 0 src/main/resources/assets/nyx/models/block/star_block.json
  90. 0 src/main/resources/assets/nyx/models/block/star_inner_stairs.json
  91. 0 src/main/resources/assets/nyx/models/block/star_outer_stairs.json
  92. 0 src/main/resources/assets/nyx/models/block/star_slab.json
  93. 0 src/main/resources/assets/nyx/models/block/star_slab_top.json
  94. 0 src/main/resources/assets/nyx/models/block/star_stairs.json
  95. 0 src/main/resources/assets/nyx/models/item/chiseled_star_block.json
  96. 0 src/main/resources/assets/nyx/models/item/cracked_star_block.json
  97. 0 src/main/resources/assets/nyx/models/item/crystal.json
  98. 0 src/main/resources/assets/nyx/models/item/fallen_star.json
  99. 0 src/main/resources/assets/nyx/models/item/gleaning_meteor_rock.json
  100. 0 src/main/resources/assets/nyx/models/item/lunar_water_bottle.json
  101. 0 src/main/resources/assets/nyx/models/item/meteor_axe.json
  102. 0 src/main/resources/assets/nyx/models/item/meteor_block.json
  103. 0 src/main/resources/assets/nyx/models/item/meteor_boots.json
  104. 0 src/main/resources/assets/nyx/models/item/meteor_bow.json
  105. 0 src/main/resources/assets/nyx/models/item/meteor_bow_pulling_0.json
  106. 0 src/main/resources/assets/nyx/models/item/meteor_bow_pulling_1.json
  107. 0 src/main/resources/assets/nyx/models/item/meteor_bow_pulling_2.json
  108. 0 src/main/resources/assets/nyx/models/item/meteor_chest.json
  109. 0 src/main/resources/assets/nyx/models/item/meteor_dust.json
  110. 0 src/main/resources/assets/nyx/models/item/meteor_finder.json
  111. 0 src/main/resources/assets/nyx/models/item/meteor_glass.json
  112. 0 src/main/resources/assets/nyx/models/item/meteor_hammer.json
  113. 0 src/main/resources/assets/nyx/models/item/meteor_helm.json
  114. 0 src/main/resources/assets/nyx/models/item/meteor_hoe.json
  115. 0 src/main/resources/assets/nyx/models/item/meteor_ingot.json
  116. 0 src/main/resources/assets/nyx/models/item/meteor_pants.json
  117. 0 src/main/resources/assets/nyx/models/item/meteor_pickaxe.json
  118. 0 src/main/resources/assets/nyx/models/item/meteor_rock.json
  119. 0 src/main/resources/assets/nyx/models/item/meteor_shard.json
  120. 0 src/main/resources/assets/nyx/models/item/meteor_shovel.json
  121. +39 −40 src/main/resources/assets/nyx/models/item/meteor_sword.json
  122. 0 src/main/resources/assets/nyx/models/item/scythe.json
  123. 0 src/main/resources/assets/nyx/models/item/star_block.json
  124. 0 src/main/resources/assets/nyx/models/item/star_slab.json
  125. 0 src/main/resources/assets/nyx/models/item/star_stairs.json
  126. 0 src/main/resources/assets/nyx/models/item/unrefined_crystal.json
  127. 0 src/main/resources/assets/nyx/recipes/chiseled_star_block.json
  128. 0 src/main/resources/assets/nyx/recipes/meteor_axe.json
  129. 0 src/main/resources/assets/nyx/recipes/meteor_boots.json
  130. 0 src/main/resources/assets/nyx/recipes/meteor_bow.json
  131. 0 src/main/resources/assets/nyx/recipes/meteor_chest.json
  132. 0 src/main/resources/assets/nyx/recipes/meteor_dust.json
  133. 0 src/main/resources/assets/nyx/recipes/meteor_finder.json
  134. 0 src/main/resources/assets/nyx/recipes/meteor_hammer.json
  135. 0 src/main/resources/assets/nyx/recipes/meteor_helm.json
  136. 0 src/main/resources/assets/nyx/recipes/meteor_hoe.json
  137. 0 src/main/resources/assets/nyx/recipes/meteor_pants.json
  138. 0 src/main/resources/assets/nyx/recipes/meteor_pickaxe.json
  139. 0 src/main/resources/assets/nyx/recipes/meteor_shovel.json
  140. 0 src/main/resources/assets/nyx/recipes/meteor_storage.json
  141. 0 src/main/resources/assets/nyx/recipes/meteor_sword.json
  142. 0 src/main/resources/assets/nyx/recipes/meteor_unstorage.json
  143. 0 src/main/resources/assets/nyx/recipes/scythe.json
  144. 0 src/main/resources/assets/nyx/recipes/star_block.json
  145. 0 src/main/resources/assets/nyx/recipes/star_slab.json
  146. 0 src/main/resources/assets/nyx/recipes/star_stairs.json
  147. 0 src/main/resources/assets/nyx/sounds.json
  148. BIN src/main/resources/assets/nyx/sounds/falling_meteor.ogg
  149. BIN src/main/resources/assets/nyx/sounds/falling_meteor_impact.ogg
  150. BIN src/main/resources/assets/nyx/sounds/falling_star.ogg
  151. BIN src/main/resources/assets/nyx/sounds/falling_star_impact.ogg
  152. BIN src/main/resources/assets/nyx/sounds/hammer_end.ogg
  153. BIN src/main/resources/assets/nyx/sounds/hammer_start.ogg
  154. BIN src/main/resources/assets/nyx/sounds/lunar_water.ogg
  155. BIN src/main/resources/assets/nyx/textures/blocks/chiseled_star.png
  156. BIN src/main/resources/assets/nyx/textures/blocks/cracked_star.png
  157. BIN src/main/resources/assets/nyx/textures/blocks/crystal.png
  158. BIN src/main/resources/assets/nyx/textures/blocks/gleaning_meteor_rock.png
  159. BIN src/main/resources/assets/nyx/textures/blocks/lunar_water_flowing.png
  160. 0 src/main/resources/assets/nyx/textures/blocks/lunar_water_flowing.png.mcmeta
  161. BIN src/main/resources/assets/nyx/textures/blocks/lunar_water_still.png
  162. 0 src/main/resources/assets/nyx/textures/blocks/lunar_water_still.png.mcmeta
  163. BIN src/main/resources/assets/nyx/textures/blocks/meteor_block.png
  164. BIN src/main/resources/assets/nyx/textures/blocks/meteor_glass.png
  165. BIN src/main/resources/assets/nyx/textures/blocks/meteor_rock.png
  166. BIN src/main/resources/assets/nyx/textures/blocks/star.png
  167. BIN src/main/resources/assets/nyx/textures/items/fallen_star.png
  168. 0 src/main/resources/assets/nyx/textures/items/fallen_star.png.mcmeta
  169. BIN src/main/resources/assets/nyx/textures/items/lunar_water_bottle.png
  170. BIN src/main/resources/assets/nyx/textures/items/meteor_axe.png
  171. BIN src/main/resources/assets/nyx/textures/items/meteor_boots.png
  172. BIN src/main/resources/assets/nyx/textures/items/meteor_bow_pulling_0.png
  173. BIN src/main/resources/assets/nyx/textures/items/meteor_bow_pulling_1.png
  174. BIN src/main/resources/assets/nyx/textures/items/meteor_bow_pulling_2.png
  175. BIN src/main/resources/assets/nyx/textures/items/meteor_bow_standby.png
  176. BIN src/main/resources/assets/nyx/textures/items/meteor_chest.png
  177. BIN src/main/resources/assets/nyx/textures/items/meteor_dust.png
  178. BIN src/main/resources/assets/nyx/textures/items/meteor_hammer.png
  179. BIN src/main/resources/assets/nyx/textures/items/meteor_helm.png
  180. BIN src/main/resources/assets/nyx/textures/items/meteor_hoe.png
  181. BIN src/main/resources/assets/nyx/textures/items/meteor_ingot.png
  182. BIN src/main/resources/assets/nyx/textures/items/meteor_pants.png
  183. BIN src/main/resources/assets/nyx/textures/items/meteor_pickaxe.png
  184. BIN src/main/resources/assets/nyx/textures/items/meteor_shard.png
  185. BIN src/main/resources/assets/nyx/textures/items/meteor_shovel.png
  186. BIN src/main/resources/assets/nyx/textures/items/meteor_sword.png
  187. BIN src/main/resources/assets/nyx/textures/items/scythe.png
  188. BIN src/main/resources/assets/nyx/textures/items/unrefined_crystal.png
  189. BIN src/main/resources/assets/nyx/textures/models/armor/meteor_layer_1.png
  190. BIN src/main/resources/assets/nyx/textures/models/armor/meteor_layer_2.png
  191. BIN src/main/resources/assets/nyx/textures/models/meteor.png
  192. BIN src/main/resources/assets/nyx/textures/moon/blood_moon.png
  193. BIN src/main/resources/assets/nyx/textures/moon/harvest_moon.png
  194. 0 src/main/resources/mcmod.info
4 changes: 2 additions & 2 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@
/classes
/bin/
/run/
/.vscode

*.classpath
*.project
.settings/org.eclipse.buildship.core.prefs
*.launch
.settings/org.eclipse.jdt.core.prefs
.settings
*.prefs
Empty file modified Jenkinsfile
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
28 changes: 25 additions & 3 deletions build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven'

version = "1.4.2"
version = "1.6.1"
group = "de.ellpeck.nyx"
archivesBaseName = "Nyx"

@@ -31,7 +31,23 @@ repositories {
}

dependencies {
deobfCompile "mezz.jei:jei_1.12.2:4.14.4.267"
deobfCompile "mezz.jei:jei_1.12.2:4.16.1.302"
compileOnly "com.google.guava:guava:31+"
compileOnly "org.apache.commons:commons-lang3:3.12+"
compileOnly "org.apache.logging.log4j:log4j-core:2.17+"
compileOnly "io.netty:netty-all:4.1.77+"

deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.3.55"

if (runInspirations.toBoolean()) {
deobfCompile(inspirationsString) { // run w/ inspirations
exclude group: 'mezz.jei'
}
} else {
compileOnly(inspirationsString) { // run w/o inspirations
exclude group: 'mezz.jei'
}
}
}


@@ -56,4 +72,10 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
}

jar {
manifest {
attributes 'FMLAT': 'nyx_at.cfg'
}
}
3 changes: 3 additions & 0 deletions gradle.properties
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G

runInspirations = true
inspirationsString = knightminer:Inspirations:1.12.2-0.2.9.9
Empty file modified gradle/wrapper/gradle-wrapper.jar
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
100644 → 100755
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
Empty file modified gradlew
100644 → 100755
Empty file.
Empty file modified gradlew.bat
100644 → 100755
Empty file.
Loading