Skip to content

Commit

Permalink
1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
RogueLogix committed Feb 18, 2024
1 parent 9fe97f8 commit b08980a
Show file tree
Hide file tree
Showing 74 changed files with 1,567 additions and 1,432 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ out
*.ipr
*.iws
*.iml
.idea

# gradle
build
Expand Down
11 changes: 11 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/inspectionProfiles/PhosCodeStyle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions .idea/remote-targets.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Phosphophyllite
Submodule Phosphophyllite updated 73 files
+0 −1 .gitignore
+11 −0 .idea/.gitignore
+20 −0 .idea/codeStyles/Project.xml
+5 −0 .idea/codeStyles/codeStyleConfig.xml
+6 −0 .idea/compiler.xml
+18 −0 .idea/gradle.xml
+28 −0 .idea/inspectionProfiles/PhosCodeStyle.xml
+6 −0 .idea/inspectionProfiles/profiles_settings.xml
+16 −0 .idea/misc.xml
+8 −0 .idea/modules.xml
+6 −0 .idea/vcs.xml
+36 −59 build.gradle
+5 −4 gradle.properties
+10 −10 src/main/java/net/roguelogix/phosphophyllite/Phosphophyllite.java
+0 −1 src/main/java/net/roguelogix/phosphophyllite/blocks/PhosphophylliteOre.java
+0 −63 src/main/java/net/roguelogix/phosphophyllite/blocks/PhosphophylliteOreTile.java
+8 −16 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/FluidBlackHoleTile.java
+7 −15 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/ItemBlackHoleTile.java
+8 −8 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/PowerBlackHole.java
+53 −57 src/main/java/net/roguelogix/phosphophyllite/blocks/blackholes/PowerBlackHoleTile.java
+12 −19 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/FluidWhiteHoleTile.java
+12 −26 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/ItemWhiteHoleTile.java
+7 −8 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/PowerWhiteHole.java
+28 −48 src/main/java/net/roguelogix/phosphophyllite/blocks/whiteholes/PowerWhiteHoleTile.java
+100 −0 src/main/java/net/roguelogix/phosphophyllite/capability/CachedWrappedBlockCapability.java
+37 −95 src/main/java/net/roguelogix/phosphophyllite/client/gui/GuiSync.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/client/gui/RenderHelper.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/ScreenCallbacks.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/api/IRender.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/api/ITooltip.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/AbstractElement.java
+4 −4 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/InteractiveElement.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/RenderedElement.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/client/gui/elements/TooltipElement.java
+6 −6 src/main/java/net/roguelogix/phosphophyllite/client/gui/screens/PhosphophylliteScreen.java
+43 −59 src/main/java/net/roguelogix/phosphophyllite/config/ConfigManager.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/config/ConfigRegistration.java
+2 −1 src/main/java/net/roguelogix/phosphophyllite/config/ConfigType.java
+270 −280 src/main/java/net/roguelogix/phosphophyllite/energy/EnergyHandlerWrappers.java
+21 −70 src/main/java/net/roguelogix/phosphophyllite/energy/IEnergyTile.java
+7 −6 src/main/java/net/roguelogix/phosphophyllite/energy/IPhosphophylliteEnergyHandler.java
+2 −1 src/main/java/net/roguelogix/phosphophyllite/event/ReloadDataEvent.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/fluids/FluidHandlerWrapper.java
+5 −6 src/main/java/net/roguelogix/phosphophyllite/fluids/IPhosphophylliteFluidHandler.java
+25 −21 src/main/java/net/roguelogix/phosphophyllite/fluids/MekanismGasWrappers.java
+17 −31 src/main/java/net/roguelogix/phosphophyllite/fluids/PhosphophylliteFluidStack.java
+25 −0 src/main/java/net/roguelogix/phosphophyllite/items/Wrench.java
+0 −8 src/main/java/net/roguelogix/phosphophyllite/mixin/helpers/IPhosphophylliteLazyOptional.java
+0 −21 src/main/java/net/roguelogix/phosphophyllite/mixin/mixins/LazyOptionalMixin.java
+1 −19 src/main/java/net/roguelogix/phosphophyllite/modular/api/TileModule.java
+4 −4 src/main/java/net/roguelogix/phosphophyllite/modular/tile/IIsTickingTracker.java
+0 −271 src/main/java/net/roguelogix/phosphophyllite/modular/tile/ISidedMultipart.java
+8 −50 src/main/java/net/roguelogix/phosphophyllite/modular/tile/PhosphophylliteTile.java
+7 −7 src/main/java/net/roguelogix/phosphophyllite/multiblock/MultiblockRegistry.java
+69 −28 src/main/java/net/roguelogix/phosphophyllite/networking/SimplePhosChannel.java
+70 −0 src/main/java/net/roguelogix/phosphophyllite/registry/CapabilityRegistration.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/registry/PhosphophylliteFluid.java
+7 −0 src/main/java/net/roguelogix/phosphophyllite/registry/RegisterCapability.java
+156 −61 src/main/java/net/roguelogix/phosphophyllite/registry/Registry.java
+0 −14 src/main/java/net/roguelogix/phosphophyllite/registry/SideOnly.java
+12 −0 src/main/java/net/roguelogix/phosphophyllite/serialization/PhosphophylliteCompound.java
+2 −2 src/main/java/net/roguelogix/phosphophyllite/threading/Queues.java
+1 −1 src/main/java/net/roguelogix/phosphophyllite/threading/WorkQueue.java
+15 −0 src/main/java/net/roguelogix/phosphophyllite/util/API.java
+1 −1 src/main/java/net/roguelogix/phosphophyllite/util/NonnullDefault.java
+1 −8 src/main/java/net/roguelogix/phosphophyllite/util/Pair.java
+3 −3 src/main/java/net/roguelogix/phosphophyllite/util/Util.java
+2 −2 src/main/resources/META-INF/accesstransformer.cfg
+8 −5 src/main/resources/META-INF/mods.toml
+6 −0 src/main/resources/assets/phosphophyllite/models/item/wrench.json
+6 −0 src/main/resources/data/forge/tags/items/tools/wrench.json
+2 −3 src/main/resources/phosphophyllite.mixins.json
+ src/main/resources/phosphophyllite.png
Loading

0 comments on commit b08980a

Please sign in to comment.