-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Simplified code to have a single blockstate loop and made everything simpler - Palette no longer contains unused IDs such as sandstone or door default blockstates - Schematics use placeholders for doors and monolith to make updating them not require changing all the schematics - Fixed bug where book wasn't being translated - Make a library with default destinations and link properties - Remove translateIdCrude, since the schematic conversion code won't be run from outside the dev environment anymore - Looked at net.minecraft.util.datafix to check if there were any updates that needed to be done - Added error checking code to make sure everything is being converted correctly - Removed schematic info generator, that will be added to a separate tool that can run on the new schematics (once the old ones are replaced) - Manually checked the NBT to make sure everything is ok - Fixed the schematic containing sandstone at y=0 (it was obvious it needed to be ancient fabric) - Changed door item ids from "dimensional_door" to "iron_dimensional_door" and from "warp_dimensional_door" to "oak_dimensional_door" to match vanilla (we might want to implement more/all wood types in the future, so it's better to do it now rather than have to convert all schematics) and renamed "rift" - Added "powered" to note blocks NBT (checked which were powered before) - Added "CookTimeTotal" to furnace NBT - Fix the_nexus having SenseiKiwi's hideout door being converted to a dimensional door
- Loading branch information
Showing
49 changed files
with
597 additions
and
621 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
src/main/java/org/dimdev/dimdoors/shared/pockets/DefaultDungeonDestinations.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package org.dimdev.dimdoors.shared.pockets; | ||
|
||
import org.dimdev.dimdoors.shared.rifts.RiftDestination; | ||
import org.dimdev.dimdoors.shared.rifts.destinations.AvailableLinkDestination; | ||
import org.dimdev.dimdoors.shared.rifts.destinations.PocketEntranceMarker; | ||
import org.dimdev.dimdoors.shared.rifts.destinations.PocketExitMarker; | ||
import org.dimdev.dimdoors.shared.rifts.registry.LinkProperties; | ||
|
||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
|
||
public final class DefaultDungeonDestinations { // TODO: lower weights? | ||
|
||
public static final LinkProperties pocketLinkProperties = LinkProperties.builder() | ||
.groups(new HashSet<>(Arrays.asList(0, 1))) | ||
.linksRemaining(1).build(); | ||
|
||
public static final LinkProperties overworldLinkProperties = LinkProperties.builder() | ||
.groups(new HashSet<>(Arrays.asList(0, 1))) | ||
.entranceWeight(50) | ||
.linksRemaining(1).build(); | ||
|
||
public static final RiftDestination deeperDungeonDestination = AvailableLinkDestination.builder() | ||
.acceptedGroups(Collections.singleton(0)) | ||
.coordFactor(1) | ||
.negativeDepthFactor(10000) | ||
.positiveDepthFactor(160) | ||
.weightMaximum(100) | ||
.newRiftWeight(1).build(); | ||
|
||
public static final RiftDestination shallowerDungeonDestination = AvailableLinkDestination.builder() | ||
.acceptedGroups(Collections.singleton(0)) | ||
.coordFactor(1) | ||
.negativeDepthFactor(160) | ||
.positiveDepthFactor(10000) | ||
.weightMaximum(100) | ||
.newRiftWeight(1).build(); | ||
|
||
public static final RiftDestination overworldDestination = AvailableLinkDestination.builder() | ||
.acceptedGroups(Collections.singleton(0)) | ||
.coordFactor(1) | ||
.negativeDepthFactor(0.00000000001) // The division result is cast to an int, so Double.MIN_VALUE would cause an overflow | ||
.positiveDepthFactor(Double.POSITIVE_INFINITY) | ||
.weightMaximum(100) | ||
.newRiftWeight(1).build(); | ||
|
||
public static final RiftDestination twoWayPocketEntrance = PocketEntranceMarker.builder() | ||
.weight(1) | ||
.ifDestination(PocketExitMarker.builder().build()) | ||
.otherwiseDestination(AvailableLinkDestination.builder() | ||
.acceptedGroups(Collections.singleton(0)) | ||
.coordFactor(1) | ||
.negativeDepthFactor(80) | ||
.positiveDepthFactor(10000) | ||
.weightMaximum(100) | ||
.newRiftWeight(1).build()).build(); | ||
|
||
public static final RiftDestination gatewayDestination = AvailableLinkDestination.builder() | ||
.acceptedGroups(Collections.singleton(0)) | ||
.coordFactor(1) // TODO: lower value? | ||
.negativeDepthFactor(Double.POSITIVE_INFINITY) | ||
.positiveDepthFactor(160) // TODO: lower value? | ||
.weightMaximum(300) // Link further away | ||
.newRiftWeight(1) | ||
.build(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.