lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Properly added API

Browse source 
Actually put the API in the correct spot >.>
This commit is contained in:
WayofTime 2020-11-15 16:33:42 -05:00
parent 2dafb837f1
commit bc2530583a
13 changed files with 187 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -161,7 +161,7 @@ jar.finalizedBy('reobfJar')
sourceSets.main.resources {
srcDir 'src/generated/resources'
srcDir 'api/main/java'
srcDir 'src/api/java'
}
publishing {

0
api/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java → src/api/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java
View file

0
api/main/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java → src/api/java/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java
View file

0
api/main/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java → src/api/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java
View file

0
api/main/java/wayoftime/bloodmagic/api/SerializerHelper.java → src/api/java/wayoftime/bloodmagic/api/SerializerHelper.java
View file

53
src/main/java/wayoftime/bloodmagic/structures/Dungeon.java
View file

@ -10,7 +10,6 @@ import java.util.Random;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.block.Blocks;
import net.minecraft.util.Direction;
import net.minecraft.util.Mirror;
import net.minecraft.util.Rotation;
@ -29,10 +28,10 @@ public class Dungeon
Map<Direction, List<BlockPos>> availableDoorMap = new HashMap<>(); // Map of doors. The EnumFacing indicates
// what way this door faces.
List<AreaDescriptor> descriptorList = new ArrayList<>();
// Map<BlockPos, Pair<DungeonRoom, PlacementSettings>> roomMap = new HashMap<>(); // Placement positions in terms
Map<BlockPos, Pair<DungeonRoom, PlacementSettings>> roomMap = new HashMap<>(); // Placement positions in terms
// // of actual positions
List<Pair<BlockPos, Pair<DungeonRoom, PlacementSettings>>> roomList = new ArrayList<>();
// List<Pair<BlockPos, Pair<DungeonRoom, PlacementSettings>>> roomList = new ArrayList<>();
PlacementSettings settings = new PlacementSettings();
Mirror mir = Mirror.NONE;
@ -58,12 +57,12 @@ public class Dungeon
// BlockPos blockpos2 = blockpos.add(this.position);
// p_242689_3_.func_237144_a_(p_242689_1_, blockpos2, placementsettings, func_214074_b(this.seed));
List<Rotation> rotationInfo = new ArrayList();
// List<Rotation> rotationInfo = new ArrayList();
int n = 1;
// int n = 1;
DungeonRoom room = getRandomRoom(rand);
// roomMap.put(pos, Pair.of(room, settings.copy()));
roomList.add(Pair.of(pos, Pair.of(room, settings.copy())));
roomMap.put(pos, Pair.of(room, settings.copy()));
// roomList.add(Pair.of(pos, Pair.of(room, settings.copy())));
descriptorList.addAll(room.getAreaDescriptors(settings, pos));
for (Direction facing : Direction.values())
{
@ -78,7 +77,7 @@ public class Dungeon
}
}
rotationInfo.add(settings.getRotation());
// rotationInfo.add(settings.getRotation());
// Initial AreaDescriptors and door positions are initialized. Time for fun!
for (int i = 0; i < 100; i++)
@ -133,22 +132,22 @@ public class Dungeon
}
}
// roomMap.put(roomLocation, Pair.of(testingRoom, settings.copy()));
roomList.add(Pair.of(roomLocation, Pair.of(testingRoom, settings.copy())));
roomMap.put(roomLocation, Pair.of(testingRoom, settings.copy()));
// roomList.add(Pair.of(roomLocation, Pair.of(testingRoom, settings.copy())));
descriptorList.addAll(descriptors);
removedDoor1 = Pair.of(doorFacing, availableDoor);
removedDoor2 = Pair.of(oppositeDoorFacing, testDoor.add(roomLocation));
room = testingRoom;
n++;
rotationInfo.add(randRotation);
System.out.println("Placement: " + n);
for (Direction facing : Direction.values())
{
List<BlockPos> testingDoorList = testingRoom.getDoorOffsetsForFacing(settings, facing, BlockPos.ZERO);
System.out.println("Door Facing: " + facing + ", Door List: " + testingDoorList);
}
// n++;
// rotationInfo.add(randRotation);
// System.out.println("Placement: " + n);
//
// for (Direction facing : Direction.values())
// {
// List<BlockPos> testingDoorList = testingRoom.getDoorOffsetsForFacing(settings, facing, BlockPos.ZERO);
// System.out.println("Door Facing: " + facing + ", Door List: " + testingDoorList);
// }
break testDirection;
}
@ -197,24 +196,24 @@ public class Dungeon
BMLog.DEBUG.info("Duration: " + duration + "(ns), " + duration / 1000000 + "(ms)");
// Building what I've got
n = 0;
// for (Entry<BlockPos, Pair<DungeonRoom, PlacementSettings>> entry : roomMap.entrySet())
for (Pair<BlockPos, Pair<DungeonRoom, PlacementSettings>> entry : roomList)
// n = 0;
for (Entry<BlockPos, Pair<DungeonRoom, PlacementSettings>> entry : roomMap.entrySet())
// for (Pair<BlockPos, Pair<DungeonRoom, PlacementSettings>> entry : roomList)
{
n++;
// n++;
BlockPos placementPos = entry.getKey();
DungeonRoom placedRoom = entry.getValue().getKey();
PlacementSettings placementSettings = entry.getValue().getValue();
placedRoom.placeStructureAtPosition(rand, placementSettings, world, placementPos);
world.setBlockState(placementPos, Blocks.REDSTONE_BLOCK.getDefaultState(), 3);
System.out.println("Supposed Rotation for " + n + ": " + rotationInfo.get(n - 1));
System.out.println("Placement: " + n + ", BlockPos: " + placementPos + ", Rotation: " + placementSettings.getRotation());
// world.setBlockState(placementPos, Blocks.REDSTONE_BLOCK.getDefaultState(), 3);
// System.out.println("Supposed Rotation for " + n + ": " + rotationInfo.get(n - 1));
// System.out.println("Placement: " + n + ", BlockPos: " + placementPos + ", Rotation: " + placementSettings.getRotation());
}
// System.out.println(roomMap.size());
System.out.println(roomList.size());
// System.out.println(roomList.size());
return false;
}

2
src/main/resources/assets/bloodmagic/schematics/four_way_corridor.json
View file

@ -1,5 +1,5 @@
{
"dungeonWeight": 4,
"dungeonWeight": 2,
"structureMap": {
"bloodmagic:four_way_corridor": {
"x": 0,

2
src/main/resources/assets/bloodmagic/schematics/ore_hold_1.json
View file

@ -1,5 +1,5 @@
{
"dungeonWeight": 8,
"dungeonWeight": 4,
"structureMap": {
"bloodmagic:ore_hold_1": {
"x": 0,

70
src/main/resources/assets/bloodmagic/schematics/overlapped_corridor.json Normal file
View file

@ -0,0 +1,70 @@
{
"dungeonWeight": 2,
"structureMap": {
"bloodmagic:overlapped_corridor": {
"x": 0,
"y": 0,
"z": 0
}
},
"doorMap": {
"north": [
{
"x": 5,
"y": 0,
"z": 0
}
],
"south": [
{
"x": 5,
"y": 0,
"z": 10
}
],
"west": [
{
"x": 0,
"y": 4,
"z": 5
}
],
"east": [
{
"x": 10,
"y": 4,
"z": 5
}
]
},
"descriptorList": [
{
"minimumOffset": {
"x": 3,
"y": 0,
"z": 0
},
"maximumOffset": {
"x": 8,
"y": 5,
"z": 11
},
"blockPosCache": [],
"cache": true
},
{
"minimumOffset": {
"x": 0,
"y": 4,
"z": 3
},
"maximumOffset": {
"x": 11,
"y": 9,
"z": 8
},
"blockPosCache": [],
"cache": true
}
]
}

6
src/main/resources/assets/bloodmagic/schematics/schematics.json
View file

@ -1,3 +1,7 @@
[
"bloodmagic:t_corridor"
"bloodmagic:t_corridor",
"bloodmagic:four_way_corridor_loot",
"bloodmagic:four_way_corridor",
"bloodmagic:ore_hold_1",
"bloodmagic:straight_corridor"
]

81
src/main/resources/assets/bloodmagic/schematics/spiral_staircase.json Normal file
View file

@ -0,0 +1,81 @@
{
"dungeonWeight": 4,
"structureMap": {
"bloodmagic:spiral_staircase": {
"x": 0,
"y": 0,
"z": 0
}
},
"doorMap": {
"north": [
{
"x": 5,
"y": 0,
"z": 0
},
{
"x": 5,
"y": 12,
"z": 0
}
],
"south": [
{
"x": 5,
"y": 0,
"z": 14
},
{
"x": 5,
"y": 12,
"z": 10
}
],
"west": [
{
"x": 0,
"y": 0,
"z": 5
},
{
"x": 0,
"y": 12,
"z": 5
}
],
"east": [
{
"x": 10,
"y": 0,
"z": 5
},
{
"x": 10,
"y": 6,
"z": 5
},
{
"x": 10,
"y": 12,
"z": 5
}
]
},
"descriptorList": [
{
"minimumOffset": {
"x": 0,
"y": 0,
"z": 0
},
"maximumOffset": {
"x": 11,
"y": 18,
"z": 11
},
"blockPosCache": [],
"cache": true
}
]
}

2
src/main/resources/assets/bloodmagic/schematics/straight_corridor.json
View file

@ -1,5 +1,5 @@
{
"dungeonWeight": 4,
"dungeonWeight": 2,
"structureMap": {
"bloodmagic:straight_corridor": {
"x": 0,

2
src/main/resources/assets/bloodmagic/schematics/t_corridor.json
View file

@ -1,5 +1,5 @@
{
"dungeonWeight": 12,
"dungeonWeight": 2,
"structureMap": {
"bloodmagic:t_corridor": {
"x": 0,